Update.

2000-08-12  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Handle
	__USE_FILE_OFFSET64 correctly for locking.
	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.

diff --git a/ChangeLog b/ChangeLog
index ef61a2b7c672cbbe492b00565a2d1cf0324d0cae..2faa12c1fcb00167bdbafd9b62d0c9a860e0851a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-12  Andreas Jaeger  <aj@suse.de>
+
+       * sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Handle
+       __USE_FILE_OFFSET64 correctly for locking.
+       * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
+
 2000-08-12  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_FCNTL64):

diff --git a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
index fd86c555a7199f26aba7078a62908f9c6b38ada0..ba15580277971c5004ef8377a0aac046114f825a 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
@@ -65,9 +65,15 @@
 #define F_SETFD                2       /* Set file descriptor flags.  */
 #define F_GETFL                3       /* Get file status flags.  */
 #define F_SETFL                4       /* Set file status flags.  */
-#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
 #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).  */

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
index 4cf16f222ceb432ac6c1e96dff79c6c7573faa91..bcc96244c63f6f088ae083097f610288a4c739a5 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
@@ -79,9 +79,15 @@
 # define F_GETOWN      5       /* Get owner of socket (receiver of SIGIO).  */
 # define F_SETOWN      6       /* Set owner of socket (receiver of SIGIO).  */
 #endif
-#define F_GETLK                7       /* Get record locking info.  */
-#define F_SETLK                8       /* Set record locking info (non-blocking).  */
-#define F_SETLKW       9       /* Set record locking info (blocking).  */
+#ifndef __USE_FILE_OFFSET64
+# define F_GETLK       7       /* Get record locking info.  */
+# define F_SETLK       8       /* Set record locking info (non-blocking).  */
+# define F_SETLKW      9       /* 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
 
 #ifdef __USE_GNU
 # define F_SETSIG      10      /* Set number of signal to be sent.  */
@@ -89,13 +95,13 @@
 #endif
 
 #if __WORDSIZE == 64
-#define F_GETLK64      F_GETLK /* Get record locking info.  */
-#define F_SETLK64      F_SETLK /* Set record locking info (non-blocking).  */
-#define F_SETLKW64     F_SETLKW /* Set record locking info (blocking).  */
+# 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).  */
 #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 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).  */
 #endif
 
 /* for F_[GET|SET]FL */