From: Andreas Jaeger <aj@suse.de>
Date: Wed, 24 Oct 2012 08:07:48 +0000 (+0200)
Subject: PowerPC: Use <bits/fcntl-linux.h>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38dbec99f998ad42431ecb2112486a3389c4b00c;p=thirdparty%2Fglibc.git

PowerPC: Use <bits/fcntl-linux.h>
---

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
index 86639f53d5f..e0ecb831f66 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
@@ -26,26 +26,13 @@
 #define __O_NOFOLLOW	0100000	/* Do not follow links.	 */
 #define __O_DIRECT	0400000	/* Direct disk access.	*/
 
-# if __WORDSIZE == 64
-/* Not necessary, files are always with 64bit off_t.  */
-#  define __O_LARGEFILE   0
-# else
-#  define __O_LARGEFILE	0200000
-# endif
-#endif
-
 #if __WORDSIZE == 64
-// XXX: The following three values look wrong
-# define F_GETLK64	7	/* Get record locking info.  */
-# define F_SETLK64	8	/* Set record locking info (non-blocking).  */
-# define F_SETLKW64	9	/* Set record locking info (blocking).  */
+/* Not necessary, files are always with 64bit off_t.  */
+# define __O_LARGEFILE  0
 #else
-# define F_GETLK64	12	/* Get record locking info.  */
-# define F_SETLK64	13	/* Set record locking info (non-blocking).  */
-# define F_SETLKW64	14	/* Set record locking info (blocking).  */
+# define __O_LARGEFILE	0200000
 #endif
 
-
 struct flock
   {
     short int l_type;	/* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.	*/