From 86ebe6b1334510d5e71fa1b0f686359bd655d6c5 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 27 Oct 2012 13:49:30 +0200 Subject: [PATCH] Remove redundant defines of __O_LARGEFILE * sysdeps/unix/sysv/linux/x86/bits/fcntl.h (__O_LARGEFILE) [!__x86_64]: Do not define, take value from . * sysdeps/unix/sysv/linux/s390/bits/fcntl.h (__O_LARGEFILE): [__WORDSIZE != 64]: Likewise. * sysdeps/unix/sysv/linux/generic/bits/fcntl.h: (__O_LARGEFILE) [__WORDSIZE != 64]: Do not define, take value from . --- ChangeLog | 7 +++++++ ports/ChangeLog.linux-generic | 6 ++++++ ports/sysdeps/unix/sysv/linux/generic/bits/fcntl.h | 2 -- sysdeps/unix/sysv/linux/s390/bits/fcntl.h | 2 -- sysdeps/unix/sysv/linux/x86/bits/fcntl.h | 2 -- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f02a3b6..a70fadc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-10-27 Andreas Jaeger + + * sysdeps/unix/sysv/linux/x86/bits/fcntl.h (__O_LARGEFILE) + [!__x86_64]: Do not define, take value from . + * sysdeps/unix/sysv/linux/s390/bits/fcntl.h (__O_LARGEFILE): + [__WORDSIZE != 64]: Likewise. + 2012-10-26 H.J. Lu * iconvdata/tst-table.sh: Remove ${SHELL}. diff --git a/ports/ChangeLog.linux-generic b/ports/ChangeLog.linux-generic index 6ee9a12..0dfb840 100644 --- a/ports/ChangeLog.linux-generic +++ b/ports/ChangeLog.linux-generic @@ -1,3 +1,9 @@ +2012-10-27 Andreas Jaeger + + * sysdeps/unix/sysv/linux/generic/bits/fcntl.h: (__O_LARGEFILE) + [__WORDSIZE != 64]: Do not define, take value from + . + 2012-10-23 Andreas Jaeger * sysdeps/unix/sysv/linux/generic/bits/fcntl.h: Remove all diff --git a/ports/sysdeps/unix/sysv/linux/generic/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/generic/bits/fcntl.h index 7ea207c..56a914b 100644 --- a/ports/sysdeps/unix/sysv/linux/generic/bits/fcntl.h +++ b/ports/sysdeps/unix/sysv/linux/generic/bits/fcntl.h @@ -25,8 +25,6 @@ #if __WORDSIZE == 64 # define __O_LARGEFILE 0 -#else -# define __O_LARGEFILE 0100000 #endif struct flock diff --git a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h index 43eee7a..5b95878 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h @@ -25,8 +25,6 @@ #if __WORDSIZE == 64 /* Not necessary, files are always with 64bit off_t. */ # define __O_LARGEFILE 0 -#else -# define __O_LARGEFILE 0100000 #endif #if __WORDSIZE == 64 diff --git a/sysdeps/unix/sysv/linux/x86/bits/fcntl.h b/sysdeps/unix/sysv/linux/x86/bits/fcntl.h index 9251e75..2bcded5 100644 --- a/sysdeps/unix/sysv/linux/x86/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/x86/bits/fcntl.h @@ -22,8 +22,6 @@ #ifdef __x86_64__ # define __O_LARGEFILE 0 -#else -# define __O_LARGEFILE 0100000 #endif #ifdef __x86_64__ -- 2.7.4