Use __O_LARGEFILE instead of O_LARGEFILE

diff --git a/ChangeLog b/ChangeLog
index 6fbc12d..35aa29c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-22  Andreas Jaeger  <aj@suse.de>
+
+       * sysdeps/unix/sysv/linux/s390/bits/fcntl.h (O_LARGEFILE): Rename
+       to __O_LARGEFILE.
+       * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (O_LARGEFILE): Rename
+       to __O_LARGEFILE.
+
 2012-10-21  Jim Blandy  <jimb@codesourcery.com>
            Joseph Myers  <joseph@codesourcery.com>
 

diff --git a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
index 47941c4..6f53fbc 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
@@ -25,9 +25,9 @@
 #ifdef __USE_LARGEFILE64
 # if __WORDSIZE == 64
 /* Not necessary, files are always with 64bit off_t.  */
-#  define O_LARGEFILE  0
+#  define __O_LARGEFILE        0
 # else
-#  define O_LARGEFILE  0100000
+#  define __O_LARGEFILE        0100000
 # endif
 #endif
 

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
index 9c7d43c..b8496a9 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
@@ -43,9 +43,9 @@
 
 #ifdef __USE_LARGEFILE64
 # if __WORDSIZE == 64
-#  define O_LARGEFILE  0
+#  define __O_LARGEFILE        0
 # else
-#  define O_LARGEFILE  0x40000
+#  define __O_LARGEFILE        0x40000
 # endif
 #endif