From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-5229-listarch-libc-hacker=sourceware.cygnus.com@sources.redhat.com>
Received: (qmail 21949 invoked by alias); 5 Jun 2002 17:04:47 -0000
Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sources.redhat.com>
List-Help: <mailto:libc-hacker-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: libc-hacker-owner@sources.redhat.com
Received: (qmail 21933 invoked from network); 5 Jun 2002 17:04:46 -0000
Received: from unknown (HELO sunsite.mff.cuni.cz) (195.113.19.66)
  by sources.redhat.com with SMTP; 5 Jun 2002 17:04:46 -0000
Received: (from jakub@localhost)
	by sunsite.mff.cuni.cz (8.11.6/8.11.6) id g55H4gf08871;
	Wed, 5 Jun 2002 19:04:42 +0200
Date: Wed, 05 Jun 2002 10:04:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>, aj@suse.de
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Fix sysdeps/generic/sendfile64.c, *xstat.c
Message-ID: <20020605190442.I20867@sunsite.ms.mff.cuni.cz>
Reply-To: Jakub Jelinek <jakub@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5.1i
X-SW-Source: 2002-06/txt/msg00006.txt.bz2

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