From: Andreas Jaeger <aj@suse.de>
Date: Sat, 27 Oct 2012 11:49:30 +0000 (+0200)
Subject: Remove redundant defines of __O_LARGEFILE
X-Git-Tag: glibc-2.17~341
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86ebe6b1334510d5e71fa1b0f686359bd655d6c5;p=thirdparty%2Fglibc.git

Remove redundant defines of __O_LARGEFILE

	* sysdeps/unix/sysv/linux/x86/bits/fcntl.h (__O_LARGEFILE)
	[!__x86_64]: Do not define, take value from <bits/fcntl-linux.h>.
	* 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
	<bits/fcntl-linux.h>.
---

diff --git a/ChangeLog b/ChangeLog
index f02a3b65e45..a70fadca4eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-27  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/unix/sysv/linux/x86/bits/fcntl.h (__O_LARGEFILE)
+	[!__x86_64]: Do not define, take value from <bits/fcntl-linux.h>.
+	* sysdeps/unix/sysv/linux/s390/bits/fcntl.h (__O_LARGEFILE):
+	[__WORDSIZE != 64]: Likewise.
+
 2012-10-26  H.J. Lu  <hongjiu.lu@intel.com>
 
 	*  iconvdata/tst-table.sh: Remove ${SHELL}.
diff --git a/ports/ChangeLog.linux-generic b/ports/ChangeLog.linux-generic
index 6ee9a12b2c2..0dfb8402c60 100644
--- a/ports/ChangeLog.linux-generic
+++ b/ports/ChangeLog.linux-generic
@@ -1,3 +1,9 @@
+2012-10-27  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/unix/sysv/linux/generic/bits/fcntl.h: (__O_LARGEFILE)
+	[__WORDSIZE != 64]: Do not define, take value from
+	<bits/fcntl-linux.h>.
+
 2012-10-23  Andreas Jaeger  <aj@suse.de>
 
 	* 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 7ea207c4607..56a914b7eba 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 43eee7a37a7..5b95878ccf7 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 9251e750edf..2bcded5bf34 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__