Fix latest changes in nt/inc/unistd.h.

 nt/inc/unistd.h: Don't include fcntl.h and don't define O_RDWR.

Fixes: debbugs:12881

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 95203b9d2fa48c4102ff918e1b5f1463ef1ce9c6..4f9e8a2663c2f4e5f0131bf57ecfc82a807ebf65 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-18  Eli Zaretskii  <eliz@gnu.org>
+
+       * inc/unistd.h: Don't include fcntl.h and don't define O_RDWR.
+
 2012-11-17  Juanma Barranquero  <lekktu@gmail.com>
 
        * config.nt: Sync with autogen/config.in.

diff --git a/nt/inc/unistd.h b/nt/inc/unistd.h
index 0173fdbb9431a63cb8000268c8aaa06edb7f6936..e751ed124d3beb7dd341d62372f7d1b1b3150323 100644 (file)
--- a/nt/inc/unistd.h
+++ b/nt/inc/unistd.h
@@ -26,17 +26,6 @@ extern int faccessat (int, char const *, int, int);
 #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 */