Improve <bits/fcntl-linux.h>: F_GETLK etc.

(F_GETLK, F_SETLK, F_SETLKW) [!F_GETLK]: Define values for [!__USE_FILE_OFFSET64].

diff --git a/ChangeLog b/ChangeLog
index 35aa29c..50884bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-10-22  Andreas Jaeger  <aj@suse.de>
 
+       * sysdeps/unix/sysv/linux/bits/fcntl-linux.h (F_GETLK, F_SETLK)
+       (F_SETLKW) [!F_GETLK]: Define values for [!__USE_FILE_OFFSET64].
+
        * 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

diff --git a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
index 8527371..f0c0d7d 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
+++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
@@ -98,9 +98,15 @@
 #endif
 
 #ifndef F_GETLK
-# define F_GETLK       5       /* Get record locking info.  */
-# define F_SETLK       6       /* Set record locking info (non-blocking).  */
-# define F_SETLKW      7       /* Set record locking info (blocking).  */
+# ifndef __USE_FILE_OFFSET64
+#  define F_GETLK      5       /* Get record locking info.  */
+#  define F_SETLK      6       /* Set record locking info (non-blocking).  */
+#  define F_SETLKW     7       /* Set record locking info (blocking).  */
+# else
+#  define F_GETLK      F_GETLK64  /* Get record locking info.  */
+#  define F_SETLK      F_SETLK64  /* Set record locking info (non-blocking).*/
+#  define F_SETLKW     F_SETLKW64 /* Set record locking info (blocking).  */
+# endif
 #endif
 #ifndef F_GETLK64
 # define F_GETLK64     12      /* Get record locking info.  */