[Emacs-diffs] Changes to emacs/lib-src/movemail.c,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/01/18 15:15:07

Index: lib-src/movemail.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/movemail.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- lib-src/movemail.c  13 Jan 2008 00:43:55 -0000      1.90
+++ lib-src/movemail.c  18 Jan 2008 15:15:07 -0000      1.91
@@ -113,7 +113,7 @@
 #define R_OK 4
 #endif
 
-#if defined (XENIX) || defined (WINDOWSNT)
+#ifdef WINDOWSNT
 #include <sys/locking.h>
 #endif
 
@@ -388,13 +388,13 @@
       if (indesc < 0)
        pfatal_with_name (inname);
 
-#if defined (BSD_SYSTEM) || defined (XENIX)
+#ifdef BSD_SYSTEM
       /* In case movemail is setuid to root, make sure the user can
         read the output file.  */
       /* This is desirable for all systems
         but I don't want to assume all have the umask system call */
       umask (umask (0) & 0333);
-#endif /* BSD_SYSTEM || XENIX */
+#endif /* BSD_SYSTEM */
       outdesc = open (outname, O_WRONLY | O_CREAT | O_EXCL, 0666);
       if (outdesc < 0)
        pfatal_with_name (outname);
@@ -422,15 +422,11 @@
 #ifdef MAIL_USE_LOCKF
          status = lockf (indesc, F_LOCK, 0);
 #else /* not MAIL_USE_LOCKF */
-#ifdef XENIX
-         status = locking (indesc, LK_RLCK, 0L);
-#else
 #ifdef WINDOWSNT
          status = locking (indesc, LK_RLCK, -1L);
 #else
          status = flock (indesc, LOCK_EX);
 #endif
-#endif
 #endif /* not MAIL_USE_LOCKF */
 #endif /* MAIL_USE_SYSTEM_LOCK */
        }