From a3aa89d8268a4d3af43d94e77f473753fd99d8da Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 14 Apr 2011 22:06:30 -0400 Subject: [PATCH] fix O_SYNC definition, cleanup fcntl.h --- arch/i386/bits/fcntl.h | 16 +++++----------- arch/x86_64/bits/fcntl.h | 16 +++++----------- include/fcntl.h | 8 ++++++++ 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/arch/i386/bits/fcntl.h b/arch/i386/bits/fcntl.h index fdc78736..33a5185c 100644 --- a/arch/i386/bits/fcntl.h +++ b/arch/i386/bits/fcntl.h @@ -4,26 +4,18 @@ #define O_TRUNC 01000 #define O_APPEND 02000 #define O_NONBLOCK 04000 -#define O_SYNC 010000 +#define O_DSYNC 010000 +#define O_SYNC 04010000 +#define O_RSYNC 04010000 #define O_DIRECTORY 0200000 #define O_NOFOLLOW 0400000 #define O_CLOEXEC 02000000 -/* Extensions, but in the reserved namespace, so OK */ #define O_ASYNC 020000 #define O_DIRECT 040000 #define O_LARGEFILE 0100000 #define O_NOATIME 01000000 #define O_NDELAY O_NONBLOCK -#define F_DUPFD_CLOEXEC 1030 - -#ifdef _GNU_SOURCE -#define FAPPEND O_APPEND -#define FFSYNC O_FSYNC -#define FASYNC O_ASYNC -#define FNONBLOCK O_NONBLOCK -#define FNDELAY O_NDELAY -#endif #define F_DUPFD 0 #define F_GETFD 1 @@ -37,3 +29,5 @@ #define F_GETLK 12 #define F_SETLK 13 #define F_SETLKW 14 + +#define F_DUPFD_CLOEXEC 1030 diff --git a/arch/x86_64/bits/fcntl.h b/arch/x86_64/bits/fcntl.h index 3a26ce9e..f3e99502 100644 --- a/arch/x86_64/bits/fcntl.h +++ b/arch/x86_64/bits/fcntl.h @@ -4,26 +4,18 @@ #define O_TRUNC 01000 #define O_APPEND 02000 #define O_NONBLOCK 04000 -#define O_SYNC 010000 +#define O_DSYNC 010000 +#define O_SYNC 04010000 +#define O_RSYNC 04010000 #define O_DIRECTORY 0200000 #define O_NOFOLLOW 0400000 #define O_CLOEXEC 02000000 -/* Extensions, but in the reserved namespace, so OK */ #define O_ASYNC 020000 #define O_DIRECT 040000 #define O_LARGEFILE 0 #define O_NOATIME 01000000 #define O_NDELAY O_NONBLOCK -#define F_DUPFD_CLOEXEC 1030 - -#ifdef _GNU_SOURCE -#define FAPPEND O_APPEND -#define FFSYNC O_FSYNC -#define FASYNC O_ASYNC -#define FNONBLOCK O_NONBLOCK -#define FNDELAY O_NDELAY -#endif #define F_DUPFD 0 #define F_GETFD 1 @@ -37,3 +29,5 @@ #define F_GETLK 5 #define F_SETLK 6 #define F_SETLKW 7 + +#define F_DUPFD_CLOEXEC 1030 diff --git a/include/fcntl.h b/include/fcntl.h index 6faf9cda..1c18c6e2 100644 --- a/include/fcntl.h +++ b/include/fcntl.h @@ -78,6 +78,14 @@ int posix_fallocate(int, off_t, off_t); #define S_IRWXO 0007 #endif +#ifdef _GNU_SOURCE +#define FAPPEND O_APPEND +#define FFSYNC O_FSYNC +#define FASYNC O_ASYNC +#define FNONBLOCK O_NONBLOCK +#define FNDELAY O_NDELAY +#endif + #ifdef __cplusplus } #endif -- 2.25.1