[PATCH] Fix sysdeps/generic/sendfile64.c, *xstat.c

[PATCH] Fix sysdeps/generic/sendfile64.c, *xstat.c

[Jakub Jelinek]

Hi!

This fixes 2 issues:
sendfile64.c not compiling because errno.h was not included and
also redefinition of __[fl]xstat64 in varios
sysdeps/unix/sysv/linux/*xstat.c files which do stuff like:
#define __fxstat64 __fxstat64_disable
#define __fxstat64_internal __fxstat64_internal_disable
...
#include <sys/stat.h>
to get rid of __*xstat64 prototypes.

2002-06-05  Jakub Jelinek  <jakub@redhat.com>

	* include/sys/stat.h (__fxstat64, __lxstat64): Only define if not
	already defined.
	* sysdeps/generic/sendfile64.c: Include errno.h.

--- libc/include/sys/stat.h.jj	Tue Apr 30 12:52:49 2002
+++ libc/include/sys/stat.h	Wed Jun  5 19:04:29 2002
@@ -46,9 +46,13 @@ extern __inline__ int __mknod (__const c
 # define __fstat(fd, buf)  INTUSE(__fxstat) (_STAT_VER, fd, buf)
 
 # define __fxstat(ver, fd, buf) INTUSE(__fxstat) (ver, fd, buf)
-# define __fxstat64(ver, fd, buf) INTUSE(__fxstat64) (ver, fd, buf)
+# ifndef __fxstat64
+#  define __fxstat64(ver, fd, buf) INTUSE(__fxstat64) (ver, fd, buf)
+# endif
 # define __lxstat(ver, name, buf) INTUSE(__lxstat) (ver, name, buf)
-# define __lxstat64(ver, name, buf) INTUSE(__lxstat64) (ver, name, buf)
+# ifndef __lxstat64
+#  define __lxstat64(ver, name, buf) INTUSE(__lxstat64) (ver, name, buf)
+# endif
 #else
 # define fstat64(fd, buf) __fxstat64 (_STAT_VER, fd, buf)
 # define fstat(fd, buf) __fxstat (_STAT_VER, fd, buf)
--- libc/sysdeps/generic/sendfile64.c.jj	Wed Jun  5 10:56:11 2002
+++ libc/sysdeps/generic/sendfile64.c	Wed Jun  5 19:15:31 2002
@@ -18,6 +18,7 @@
    02111-1307 USA.  */
 
 #include <sys/sendfile.h>
+#include <errno.h>
 
 /* Send COUNT bytes from file associated with IN_FD starting at OFFSET to
    descriptor OUT_FD.  */

	Jakub

Re: [PATCH] Fix sysdeps/generic/sendfile64.c, *xstat.c

[Andreas Jaeger]

Jakub Jelinek <jakub@redhat.com> writes:

> Hi!
>
> This fixes 2 issues:
> sendfile64.c not compiling because errno.h was not included and
> also redefinition of __[fl]xstat64 in varios
> sysdeps/unix/sysv/linux/*xstat.c files which do stuff like:
> #define __fxstat64 __fxstat64_disable
> #define __fxstat64_internal __fxstat64_internal_disable
> ...
> #include <sys/stat.h>
> to get rid of __*xstat64 prototypes.
>
> 2002-06-05  Jakub Jelinek  <jakub@redhat.com>
>
> 	* include/sys/stat.h (__fxstat64, __lxstat64): Only define if not
> 	already defined.

I've committed this one,

Thanks,
Andreas
-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.inka.de
    http://www.suse.de/~aj