[Emacs-diffs] emacs-24 r116942: src/w32.c (sys_umask) <WRITE_USER>: Remove redundant constant.

[Eli Zaretskii]

------------------------------------------------------------
revno: 116942
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-04-11 11:11:57 +0300
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/w32.c                      w32.c-20091113204419-o5vbwnq5f7feedwu-808

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-04-11 05:47:32 +0000
+++ b/src/ChangeLog     2014-04-11 08:11:57 +0000
@@ -1,3 +1,8 @@
+2014-04-11  Eli Zaretskii  <address@hidden>
+
+       * w32.c (sys_umask) <WRITE_USER>: Remove redundant constant, and
+       use S_IWRITE instead.
+
 2014-04-11  Glenn Morris  <address@hidden>
 
        * keyboard.c (Fopen_dribble_file): Make file private.  (Bug#17187)

=== modified file 'src/w32.c'
--- a/src/w32.c 2014-03-10 17:31:17 +0000
+++ b/src/w32.c 2014-04-11 08:11:57 +0000
@@ -5354,11 +5354,6 @@
   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 @@
      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;