* sysdeps/unix/sysv/linux/pread.c: __NR_pread64 may be defined

	instead of __NR_pread.
	* sysdeps/unix/sysv/linux/pread64.c: Likewise.
	* sysdeps/unix/sysv/linux/pwrite.c: __NR_pwrite64 may be defined
	instead of __NR_pwrite.
	* sysdeps/unix/sysv/linux/pwrite64.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index be6f1fcd5e392e065679f543026a647a668c5c96..d126ea3eda7701eabbbcc0fd904e7d256313ef36 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-14  Roland McGrath  <roland@redhat.com>
+
+       * sysdeps/unix/sysv/linux/pread.c: __NR_pread64 may be defined
+       instead of __NR_pread.
+       * sysdeps/unix/sysv/linux/pread64.c: Likewise.
+       * sysdeps/unix/sysv/linux/pwrite.c: __NR_pwrite64 may be defined
+       instead of __NR_pwrite.
+       * sysdeps/unix/sysv/linux/pwrite64.c: Likewise.
+
 2002-09-13  Roland McGrath  <roland@redhat.com>
 
        * manual/libc.texinfo: @ifinfo -> @ifnottex around copyright notice.

diff --git a/sysdeps/unix/sysv/linux/pread.c b/sysdeps/unix/sysv/linux/pread.c
index 2d5af618ac8f7571e66689679455ec34312400fb..31abf7e88688a6bb54086d846e59c3b5f4b56812 100644 (file)
--- a/sysdeps/unix/sysv/linux/pread.c
+++ b/sysdeps/unix/sysv/linux/pread.c
@@ -28,6 +28,13 @@
 
 #include "kernel-features.h"
 
+#ifdef __NR_pread64            /* Newer kernels renamed but it's the same.  */
+# ifdef __NR_pread
+#  error "__NR_pread and __NR_pread64 both defined???"
+# endif
+# define __NR_pread __NR_pread64
+#endif
+
 #if defined __NR_pread || __ASSUME_PREAD_SYSCALL > 0
 
 /* The order of hi, lo depends on endianness.  */

diff --git a/sysdeps/unix/sysv/linux/pread64.c b/sysdeps/unix/sysv/linux/pread64.c
index 8dd0059527d01bddf068d5f3c274fdfe8844e2e0..d27f9afad9ed2f4913e616f38512667cf5495f16 100644 (file)
--- a/sysdeps/unix/sysv/linux/pread64.c
+++ b/sysdeps/unix/sysv/linux/pread64.c
@@ -27,6 +27,13 @@
 
 #include "kernel-features.h"
 
+#ifdef __NR_pread64            /* Newer kernels renamed but it's the same.  */
+# ifdef __NR_pread
+#  error "__NR_pread and __NR_pread64 both defined???"
+# endif
+# define __NR_pread __NR_pread64
+#endif
+
 #if defined __NR_pread || __ASSUME_PREAD_SYSCALL > 0
 
 extern ssize_t __syscall_pread (int fd, void *__unbounded buf, size_t count,

diff --git a/sysdeps/unix/sysv/linux/pwrite.c b/sysdeps/unix/sysv/linux/pwrite.c
index 6a68adcdbd6bbfb64d510c67a9f0f5f1887c888a..45fca41aa3e7e8c5f7c4daf557fefcbbfea1c4e7 100644 (file)
--- a/sysdeps/unix/sysv/linux/pwrite.c
+++ b/sysdeps/unix/sysv/linux/pwrite.c
@@ -28,6 +28,13 @@
 
 #include "kernel-features.h"
 
+#ifdef __NR_pwrite64           /* Newer kernels renamed but it's the same.  */
+# ifdef __NR_pwrite
+#  error "__NR_pwrite and __NR_pwrite64 both defined???"
+# endif
+# define __NR_pwrite __NR_pread64
+#endif
+
 #if defined __NR_pwrite || __ASSUME_PWRITE_SYSCALL > 0
 
 /* The order of hi, lo depends on endianness.  */

diff --git a/sysdeps/unix/sysv/linux/pwrite64.c b/sysdeps/unix/sysv/linux/pwrite64.c
index 322dd5e4a02e45512898f366030e8fa3040dd794..ef7236496ae8cbe127ea789e01a0e52df3e13b3a 100644 (file)
--- a/sysdeps/unix/sysv/linux/pwrite64.c
+++ b/sysdeps/unix/sysv/linux/pwrite64.c
@@ -27,6 +27,13 @@
 
 #include "kernel-features.h"
 
+#ifdef __NR_pwrite64           /* Newer kernels renamed but it's the same.  */
+# ifdef __NR_pwrite
+#  error "__NR_pwrite and __NR_pwrite64 both defined???"
+# endif
+# define __NR_pwrite __NR_pread64
+#endif
+
 #if defined __NR_pwrite || __ASSUME_PWRITE_SYSCALL > 0
 
 extern ssize_t __syscall_pwrite (int fd, const void *__unbounded buf, size_t count,