[PATCH] Prepare PPC pread/pwrite for linux-2.5 headers

[Franz Sirl]

On Monday 04 November 2002 13:56, Franz Sirl wrote:
> On Monday 04 November 2002 13:32, Jakub Jelinek wrote:
> > On Mon, Nov 04, 2002 at 01:29:13PM +0100, Franz Sirl wrote:
> > > --- sysdeps/unix/sysv/linux/powerpc/pwrite.c	6 Jul 2001 04:56:19
> > > -0000	1.5 +++ sysdeps/unix/sysv/linux/powerpc/pwrite.c	27 Oct 2002
> > > 13:53:29 -0000 @@ -23,6 +23,13 @@
> > >  #include <sysdep.h>
> > >  #include <sys/syscall.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
> >
> > 			      ^^^^Typo.
> >
> > > +#endif
> > > +
> > >  #ifdef __NR_pwrite
> > >
> > >  extern ssize_t __syscall_pwrite (int fd, const void *buf, size_t
> > > count, --- sysdeps/unix/sysv/linux/powerpc/pwrite64.c	3 Aug 2002
> > > 06:57:52 -0000	1.7 +++ sysdeps/unix/sysv/linux/powerpc/pwrite64.c	27
> > > Oct 2002 13:53:30 -0000 @@ -23,6 +23,13 @@
> > >  #include <sysdep.h>
> > >  #include <sys/syscall.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
> >
> > 			      ^^^^Likewise.
>
> Hehe, all I can say is that it's not really my fault, I copy'n'pasted it
> from the generic ones :-).
>
> Attached a fixed patch, fixing up the generic versions as well.

Argh, another typo, this is the correct patch.

Franz.

	* sysdeps/unix/sysv/linux/pwrite.c: Fix typo.
	* sysdeps/unix/sysv/linux/pwrite64.c: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/pread.c: Handle both __NR_pread64
	and __NR_pread.
	* sysdeps/unix/sysv/linux/powerpc/pread64.c: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/pwrite.c: Handle both __NR_pwrite64
	and __NR_pwrite.
	* sysdeps/unix/sysv/linux/powerpc/pwrite64.c: Likewise.
-------------- next part --------------
Index: sysdeps/unix/sysv/linux/pwrite.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/pwrite.c,v
retrieving revision 1.13
diff -u -p -r1.13 pwrite.c
--- sysdeps/unix/sysv/linux/pwrite.c	14 Sep 2002 08:32:24 -0000	1.13
+++ sysdeps/unix/sysv/linux/pwrite.c	4 Nov 2002 13:04:19 -0000
@@ -32,7 +32,7 @@
 # ifdef __NR_pwrite
 #  error "__NR_pwrite and __NR_pwrite64 both defined???"
 # endif
-# define __NR_pwrite __NR_pread64
+# define __NR_pwrite __NR_pwrite64
 #endif
 
 #if defined __NR_pwrite || __ASSUME_PWRITE_SYSCALL > 0
Index: sysdeps/unix/sysv/linux/pwrite64.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/pwrite64.c,v
retrieving revision 1.13
diff -u -p -r1.13 pwrite64.c
--- sysdeps/unix/sysv/linux/pwrite64.c	14 Sep 2002 08:32:24 -0000	1.13
+++ sysdeps/unix/sysv/linux/pwrite64.c	4 Nov 2002 13:04:19 -0000
@@ -31,7 +31,7 @@
 # ifdef __NR_pwrite
 #  error "__NR_pwrite and __NR_pwrite64 both defined???"
 # endif
-# define __NR_pwrite __NR_pread64
+# define __NR_pwrite __NR_pwrite64
 #endif
 
 #if defined __NR_pwrite || __ASSUME_PWRITE_SYSCALL > 0
Index: sysdeps/unix/sysv/linux/powerpc/pread.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/powerpc/pread.c,v
retrieving revision 1.4
diff -u -p -r1.4 pread.c
--- sysdeps/unix/sysv/linux/powerpc/pread.c	6 Jul 2001 04:56:19 -0000	1.4
+++ sysdeps/unix/sysv/linux/powerpc/pread.c	4 Nov 2002 13:04:19 -0000
@@ -23,6 +23,13 @@
 #include <sysdep.h>
 #include <sys/syscall.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
+
 #ifdef __NR_pread
 
 extern ssize_t __syscall_pread (int fd, void *buf, size_t count,
Index: sysdeps/unix/sysv/linux/powerpc/pread64.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/powerpc/pread64.c,v
retrieving revision 1.5
diff -u -p -r1.5 pread64.c
--- sysdeps/unix/sysv/linux/powerpc/pread64.c	6 Jul 2001 04:56:19 -0000	1.5
+++ sysdeps/unix/sysv/linux/powerpc/pread64.c	4 Nov 2002 13:04:19 -0000
@@ -23,6 +23,13 @@
 #include <sysdep.h>
 #include <sys/syscall.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
+
 #ifdef __NR_pread
 
 extern ssize_t __syscall_pread (int fd, void *buf, size_t count,
Index: sysdeps/unix/sysv/linux/powerpc/pwrite.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/powerpc/pwrite.c,v
retrieving revision 1.5
diff -u -p -r1.5 pwrite.c
--- sysdeps/unix/sysv/linux/powerpc/pwrite.c	6 Jul 2001 04:56:19 -0000	1.5
+++ sysdeps/unix/sysv/linux/powerpc/pwrite.c	4 Nov 2002 13:04:19 -0000
@@ -23,6 +23,13 @@
 #include <sysdep.h>
 #include <sys/syscall.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_pwrite64
+#endif
+
 #ifdef __NR_pwrite
 
 extern ssize_t __syscall_pwrite (int fd, const void *buf, size_t count,
Index: sysdeps/unix/sysv/linux/powerpc/pwrite64.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/powerpc/pwrite64.c,v
retrieving revision 1.7
diff -u -p -r1.7 pwrite64.c
--- sysdeps/unix/sysv/linux/powerpc/pwrite64.c	3 Aug 2002 06:57:52 -0000	1.7
+++ sysdeps/unix/sysv/linux/powerpc/pwrite64.c	4 Nov 2002 13:04:19 -0000
@@ -23,6 +23,13 @@
 #include <sysdep.h>
 #include <sys/syscall.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_pwrite64
+#endif
+
 #ifdef __NR_pwrite
 
 extern ssize_t __syscall_pwrite (int fd, const void *buf, size_t count,