src/w32.c (sys_umask) <WRITE_USER>: Remove redundant constant.

 src/w32.c (sys_umask) <WRITE_USER>: Remove redundant constant, and
 use S_IWRITE instead.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9d59ab1c97c60818d784842cd3136f75a91fcb4b..22f25bef6f33f34e2b6395181da472d72735dd82 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-11  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32.c (sys_umask) <WRITE_USER>: Remove redundant constant, and
+       use S_IWRITE instead.
+
 2014-04-11  Glenn Morris  <rgm@gnu.org>
 
        * keyboard.c (Fopen_dribble_file): Make file private.  (Bug#17187)

diff --git a/src/w32.c b/src/w32.c
index 8802e13e71df7fa8e82d1bdbfc8f8fe6ef1cef41..0892f932bc29bb932134f6b2a17b85d46be402fd 100644 (file)
--- a/src/w32.c
+++ b/src/w32.c
@@ -5354,11 +5354,6 @@ utime (const char *name, struct utimbuf *times)
   return 0;
 }
 
-/* Emacs expects us to support the traditional octal form of the mode
-   bits, which is not what msvcrt.dll wants.  */
-
-#define WRITE_USER 00200
-
 int
 sys_umask (int mode)
 {
@@ -5370,14 +5365,14 @@ sys_umask (int mode)
      at all.  */
   /* FIXME: if the GROUP and OTHER bits are reset, we should use ACLs
      to prevent access by other users on NTFS.  */
-  if ((mode & WRITE_USER) != 0)
+  if ((mode & S_IWRITE) != 0)
     arg |= S_IWRITE;
 
   retval = _umask (arg);
   /* Merge into the return value the bits they've set the last time,
      which msvcrt.dll ignores and never returns.  Emacs insists on its
      notion of mask being identical to what we return.  */
-  retval |= (current_mask & ~WRITE_USER);
+  retval |= (current_mask & ~S_IWRITE);
   current_mask = mode;
 
   return retval;