[Emacs-diffs] /srv/bzr/emacs/trunk r110942: Fix latest changes in nt/inc/unistd.h.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110942
fixes bug: http://debbugs.gnu.org/12881
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2012-11-18 18:54:31 +0200
message:
  Fix latest changes in nt/inc/unistd.h.
  
   nt/inc/unistd.h: Don't include fcntl.h and don't define O_RDWR.
modified:
  nt/ChangeLog
  nt/inc/unistd.h

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-11-17 23:58:56 +0000
+++ b/nt/ChangeLog      2012-11-18 16:54:31 +0000
@@ -1,3 +1,7 @@
+2012-11-18  Eli Zaretskii  <address@hidden>
+
+       * inc/unistd.h: Don't include fcntl.h and don't define O_RDWR.
+
 2012-11-17  Juanma Barranquero  <address@hidden>
 
        * config.nt: Sync with autogen/config.in.

=== modified file 'nt/inc/unistd.h'
--- a/nt/inc/unistd.h   2012-11-17 22:12:47 +0000
+++ b/nt/inc/unistd.h   2012-11-18 16:54:31 +0000
@@ -26,17 +26,6 @@
 #define AT_EACCESS 4
 #define AT_SYMLINK_NOFOLLOW 4096
 
-/* Here are some more fcntl.h macros that default to gnulib-compatible
-   values.  Include <fcntl.h> first, to make sure we don't override
-   its values if any.  FIXME: If we know <fcntl.h> does not define
-   O_NOCTTY and O_RDWR, this can be replaced with a simple "#define
-   O_NOCTTY 0" and "#define O_RDWR 2".  */
-#include <fcntl.h>
-#ifndef O_NOCTTY
 #define O_NOCTTY 0
-#endif
-#ifndef O_RDWR
-#define O_RDWR 2
-#endif
 
 #endif /* _UNISTD_H */