From 477041e79411085b2fbe625da0b046dfa65ed708 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sat, 15 Nov 2008 15:42:40 +0000 Subject: - revert wrong r24049 --- libc/sysdeps/linux/alpha/bits/fcntl.h | 5 +++-- libc/sysdeps/linux/arm/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/avr32/bits/fcntl.h | 2 +- libc/sysdeps/linux/bfin/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/cris/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/e1/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/frv/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/h8300/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/hppa/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/i386/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/i960/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/ia64/bits/fcntl.h | 5 +++-- libc/sysdeps/linux/m68k/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/microblaze/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/mips/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/nios/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/nios2/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/powerpc/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/sh/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/sh64/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/sparc/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/v850/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/vax/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/x86_64/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/xtensa/bits/fcntl.h | 4 ++-- 25 files changed, 51 insertions(+), 49 deletions(-) (limited to 'libc/sysdeps') diff --git a/libc/sysdeps/linux/alpha/bits/fcntl.h b/libc/sysdeps/linux/alpha/bits/fcntl.h index c2d4c8d34..85e0fca30 100644 --- a/libc/sysdeps/linux/alpha/bits/fcntl.h +++ b/libc/sysdeps/linux/alpha/bits/fcntl.h @@ -159,6 +159,7 @@ struct flock64 }; #endif + /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ #ifdef __USE_BSD @@ -180,7 +181,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -229,4 +230,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/arm/bits/fcntl.h b/libc/sysdeps/linux/arm/bits/fcntl.h index 02d98eb32..01d2d3d14 100644 --- a/libc/sysdeps/linux/arm/bits/fcntl.h +++ b/libc/sysdeps/linux/arm/bits/fcntl.h @@ -189,7 +189,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -237,4 +237,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/avr32/bits/fcntl.h b/libc/sysdeps/linux/avr32/bits/fcntl.h index 2301e2241..df3eae871 100644 --- a/libc/sysdeps/linux/avr32/bits/fcntl.h +++ b/libc/sysdeps/linux/avr32/bits/fcntl.h @@ -167,8 +167,8 @@ struct flock64 { # define POSIX_FADV_NOREUSE 5 /* Data will be accessed once. */ #endif +#ifdef __USE_GNU -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing diff --git a/libc/sysdeps/linux/bfin/bits/fcntl.h b/libc/sysdeps/linux/bfin/bits/fcntl.h index be96eb36e..7e32a04e9 100644 --- a/libc/sysdeps/linux/bfin/bits/fcntl.h +++ b/libc/sysdeps/linux/bfin/bits/fcntl.h @@ -185,7 +185,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -234,4 +234,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/cris/bits/fcntl.h b/libc/sysdeps/linux/cris/bits/fcntl.h index d0fefd458..2637a6b63 100644 --- a/libc/sysdeps/linux/cris/bits/fcntl.h +++ b/libc/sysdeps/linux/cris/bits/fcntl.h @@ -186,7 +186,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -235,4 +235,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/e1/bits/fcntl.h b/libc/sysdeps/linux/e1/bits/fcntl.h index 7796b5e22..87d193923 100644 --- a/libc/sysdeps/linux/e1/bits/fcntl.h +++ b/libc/sysdeps/linux/e1/bits/fcntl.h @@ -182,7 +182,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -231,4 +231,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/frv/bits/fcntl.h b/libc/sysdeps/linux/frv/bits/fcntl.h index 70b729ca8..49da6279d 100644 --- a/libc/sysdeps/linux/frv/bits/fcntl.h +++ b/libc/sysdeps/linux/frv/bits/fcntl.h @@ -164,7 +164,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -213,4 +213,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/h8300/bits/fcntl.h b/libc/sysdeps/linux/h8300/bits/fcntl.h index 7796b5e22..87d193923 100644 --- a/libc/sysdeps/linux/h8300/bits/fcntl.h +++ b/libc/sysdeps/linux/h8300/bits/fcntl.h @@ -182,7 +182,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -231,4 +231,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/hppa/bits/fcntl.h b/libc/sysdeps/linux/hppa/bits/fcntl.h index 58fcb29c7..c6aaa3afb 100644 --- a/libc/sysdeps/linux/hppa/bits/fcntl.h +++ b/libc/sysdeps/linux/hppa/bits/fcntl.h @@ -176,7 +176,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -225,4 +225,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/i386/bits/fcntl.h b/libc/sysdeps/linux/i386/bits/fcntl.h index 257af510d..0b53b459b 100644 --- a/libc/sysdeps/linux/i386/bits/fcntl.h +++ b/libc/sysdeps/linux/i386/bits/fcntl.h @@ -189,7 +189,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -238,4 +238,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/i960/bits/fcntl.h b/libc/sysdeps/linux/i960/bits/fcntl.h index 0d35f5af1..a8efa57ec 100644 --- a/libc/sysdeps/linux/i960/bits/fcntl.h +++ b/libc/sysdeps/linux/i960/bits/fcntl.h @@ -182,7 +182,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -231,4 +231,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/ia64/bits/fcntl.h b/libc/sysdeps/linux/ia64/bits/fcntl.h index d7c5a4a00..2a4b9ca35 100644 --- a/libc/sysdeps/linux/ia64/bits/fcntl.h +++ b/libc/sysdeps/linux/ia64/bits/fcntl.h @@ -161,6 +161,7 @@ struct flock64 }; #endif + /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ #ifdef __USE_BSD @@ -182,7 +183,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -231,4 +232,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/m68k/bits/fcntl.h b/libc/sysdeps/linux/m68k/bits/fcntl.h index 52a7ff00a..37e99f9e0 100644 --- a/libc/sysdeps/linux/m68k/bits/fcntl.h +++ b/libc/sysdeps/linux/m68k/bits/fcntl.h @@ -185,7 +185,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -234,4 +234,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/microblaze/bits/fcntl.h b/libc/sysdeps/linux/microblaze/bits/fcntl.h index 7796b5e22..87d193923 100644 --- a/libc/sysdeps/linux/microblaze/bits/fcntl.h +++ b/libc/sysdeps/linux/microblaze/bits/fcntl.h @@ -182,7 +182,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -231,4 +231,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/mips/bits/fcntl.h b/libc/sysdeps/linux/mips/bits/fcntl.h index f739c508a..896786943 100644 --- a/libc/sysdeps/linux/mips/bits/fcntl.h +++ b/libc/sysdeps/linux/mips/bits/fcntl.h @@ -209,7 +209,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -258,4 +258,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/nios/bits/fcntl.h b/libc/sysdeps/linux/nios/bits/fcntl.h index abcc49264..9fc29cd8b 100644 --- a/libc/sysdeps/linux/nios/bits/fcntl.h +++ b/libc/sysdeps/linux/nios/bits/fcntl.h @@ -185,7 +185,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -234,4 +234,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/nios2/bits/fcntl.h b/libc/sysdeps/linux/nios2/bits/fcntl.h index be96eb36e..7e32a04e9 100644 --- a/libc/sysdeps/linux/nios2/bits/fcntl.h +++ b/libc/sysdeps/linux/nios2/bits/fcntl.h @@ -185,7 +185,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -234,4 +234,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/powerpc/bits/fcntl.h b/libc/sysdeps/linux/powerpc/bits/fcntl.h index eb6118c45..f26a25e76 100644 --- a/libc/sysdeps/linux/powerpc/bits/fcntl.h +++ b/libc/sysdeps/linux/powerpc/bits/fcntl.h @@ -189,7 +189,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -238,4 +238,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/sh/bits/fcntl.h b/libc/sysdeps/linux/sh/bits/fcntl.h index 762b9b0bb..93c41d225 100644 --- a/libc/sysdeps/linux/sh/bits/fcntl.h +++ b/libc/sysdeps/linux/sh/bits/fcntl.h @@ -189,7 +189,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -238,4 +238,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/sh64/bits/fcntl.h b/libc/sysdeps/linux/sh64/bits/fcntl.h index 70b729ca8..49da6279d 100644 --- a/libc/sysdeps/linux/sh64/bits/fcntl.h +++ b/libc/sysdeps/linux/sh64/bits/fcntl.h @@ -164,7 +164,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -213,4 +213,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/sparc/bits/fcntl.h b/libc/sysdeps/linux/sparc/bits/fcntl.h index 23b3d0443..5739459b0 100644 --- a/libc/sysdeps/linux/sparc/bits/fcntl.h +++ b/libc/sysdeps/linux/sparc/bits/fcntl.h @@ -208,7 +208,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -257,4 +257,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/v850/bits/fcntl.h b/libc/sysdeps/linux/v850/bits/fcntl.h index 7796b5e22..87d193923 100644 --- a/libc/sysdeps/linux/v850/bits/fcntl.h +++ b/libc/sysdeps/linux/v850/bits/fcntl.h @@ -182,7 +182,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -231,4 +231,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/vax/bits/fcntl.h b/libc/sysdeps/linux/vax/bits/fcntl.h index 91151fb52..971245da5 100644 --- a/libc/sysdeps/linux/vax/bits/fcntl.h +++ b/libc/sysdeps/linux/vax/bits/fcntl.h @@ -162,7 +162,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -211,4 +211,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/x86_64/bits/fcntl.h b/libc/sysdeps/linux/x86_64/bits/fcntl.h index 48d49adfd..42c790a51 100644 --- a/libc/sysdeps/linux/x86_64/bits/fcntl.h +++ b/libc/sysdeps/linux/x86_64/bits/fcntl.h @@ -203,7 +203,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -252,4 +252,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + diff --git a/libc/sysdeps/linux/xtensa/bits/fcntl.h b/libc/sysdeps/linux/xtensa/bits/fcntl.h index 6895402d2..23de96c02 100644 --- a/libc/sysdeps/linux/xtensa/bits/fcntl.h +++ b/libc/sysdeps/linux/xtensa/bits/fcntl.h @@ -186,7 +186,7 @@ struct flock64 #endif -#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__ +#ifdef __USE_GNU /* Flags for SYNC_FILE_RANGE. */ # define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages in the range before performing the @@ -235,4 +235,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, #endif __END_DECLS -#endif /* LINUX_SPECIFIC */ + -- cgit v1.2.3