diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-11-18 18:54:31 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-11-18 18:54:31 +0200 |
| commit | 031b541f1943a49ee06944cc5957dab3f7baedf9 (patch) | |
| tree | 624fbd50f75d4222144bdc4ade6e251be044de51 /nt | |
| parent | dfa8939b2827d23e02f3d7f6622e3a619ec6fd90 (diff) | |
| download | emacs-031b541f1943a49ee06944cc5957dab3f7baedf9.tar.gz | |
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
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/inc/unistd.h | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 95203b9d2fa..4f9e8a2663c 100644 --- 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 0173fdbb943..e751ed124d3 100644 --- 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 */ |