From: Andreas Jaeger <aj@suse.de>
Date: Mon, 22 Oct 2012 07:19:30 +0000 (+0200)
Subject: Use __O_LARGEFILE instead of O_LARGEFILE
X-Git-Tag: glibc-2.17~376
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=481b90b9d6923adcbe801b7a44f784920f15da14;p=glibc.git

Use __O_LARGEFILE instead of O_LARGEFILE
---

diff --git a/ChangeLog b/ChangeLog
index 6fbc12d6d1..35aa29c6ee 100644
--- 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 47941c4473..6f53fbc0b5 100644
--- 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 9c7d43ca91..b8496a9072 100644
--- 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