summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2014-11-25 11:42:20 +0000
committerCorinna Vinschen <corinna@vinschen.de>2014-11-25 11:42:20 +0000
commitcda7e6ca2081df83e91415e14aeef1fa9b5adf59 (patch)
tree1865a0b20d034b66cadaf4bfeb3a67cb4806d340
parentd8ba3ea1dba334ac5ac805c26755700e478025a1 (diff)
downloadcygnal-cda7e6ca2081df83e91415e14aeef1fa9b5adf59.tar.gz
cygnal-cda7e6ca2081df83e91415e14aeef1fa9b5adf59.tar.bz2
cygnal-cda7e6ca2081df83e91415e14aeef1fa9b5adf59.zip
* include/fcntl.h: Move all open flags (except O_NDELAY) to newlib's
sys/_default_fcntl.h.
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/include/fcntl.h17
2 files changed, 7 insertions, 15 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4f66888e2..10ccff6da 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
2014-11-25 Corinna Vinschen <corinna@vinschen.de>
+ * include/fcntl.h: Move all open flags (except O_NDELAY) to newlib's
+ sys/_default_fcntl.h.
+
+2014-11-25 Corinna Vinschen <corinna@vinschen.de>
+
* binmode.c (cygwin_premain0): Don't use underscore'd variants of the
open flags.
* textmode.c (cygwin_premain0): Ditto.
diff --git a/winsup/cygwin/include/fcntl.h b/winsup/cygwin/include/fcntl.h
index fe8a1fc42..d67ee48ac 100644
--- a/winsup/cygwin/include/fcntl.h
+++ b/winsup/cygwin/include/fcntl.h
@@ -1,6 +1,7 @@
/* fcntl.h
- Copyright 1996, 1998, 2000, 2001, 2005, 2006, 2009, 2010, 2013 Red Hat, Inc.
+ Copyright 1996, 1998, 2000, 2001, 2005, 2006, 2009, 2010, 2013,
+ 2014 Red Hat, Inc.
This file is part of Cygwin.
@@ -14,12 +15,6 @@ details. */
#include <sys/fcntl.h>
#define O_NDELAY _FNDELAY
-/* sys/_default_fcntl.h defines values up to 0x40000 (O_NOINHERIT). */
-#define _FDIRECT 0x80000
-#define _FNOFOLLOW 0x100000
-#define _FDIRECTORY 0x200000
-#define _FEXECSRCH 0x400000
-
/* F_LCK_MANDATORY: Request mandatory locks for this file descriptor.
Cygwin extension to fcntl file locking mechanism. By default, fcntl file
@@ -41,14 +36,6 @@ details. */
functionality is not required. */
#define O_TTY_INIT 0
-#define O_DIRECT _FDIRECT
-#define O_NOFOLLOW _FNOFOLLOW
-#define O_DSYNC _FSYNC
-#define O_RSYNC _FSYNC
-#define O_DIRECTORY _FDIRECTORY
-#define O_EXEC _FEXECSRCH
-#define O_SEARCH _FEXECSRCH
-
#define POSIX_FADV_NORMAL 0
#define POSIX_FADV_SEQUENTIAL 1
#define POSIX_FADV_RANDOM 2