From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 27 Dec 1999 07:52:32 +0000 (+0000)
Subject: Make it compile.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9b370c8f58e7b1106e209e84ac02d0af12bdb37;p=thirdparty%2Fglibc.git

Make it compile.
---

diff --git a/sysdeps/unix/sysv/linux/fxstat64.c b/sysdeps/unix/sysv/linux/fxstat64.c
index c7672e93704..94be2c23d06 100644
--- a/sysdeps/unix/sysv/linux/fxstat64.c
+++ b/sysdeps/unix/sysv/linux/fxstat64.c
@@ -43,7 +43,7 @@ __fxstat64 (int vers, int fd, struct stat64 *buf)
   int result;
 
 # if defined __NR_fstat64
-  if (! have_no_stat64)
+  if (! __have_no_stat64)
     {
       int saved_errno = errno;
       result = INLINE_SYSCALL (fstat64, 2, fd, buf);
@@ -52,7 +52,7 @@ __fxstat64 (int vers, int fd, struct stat64 *buf)
 	return result;
 
       __set_errno (saved_errno);
-      have_no_stat64 = 1;
+      __have_no_stat64 = 1;
     }
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/i386/mmap64.S b/sysdeps/unix/sysv/linux/i386/mmap64.S
index f30407f0050..5cd480b83f2 100644
--- a/sysdeps/unix/sysv/linux/i386/mmap64.S
+++ b/sysdeps/unix/sysv/linux/i386/mmap64.S
@@ -80,12 +80,11 @@ L(einval):
 	jmp SYSCALL_ERROR_LABEL
 #endif
 
-#if !defined __NR_mmap2
 
-# ifndef __NR_mmap2
+#ifndef __NR_mmap2
 	/* Save registers.  */
 	movl %ebx, %edx
-# endif
+#endif
 3:
 	cmpl $0, 44(%esp)
 	jne L(einval)
@@ -94,9 +93,9 @@ L(einval):
 
 	lea 4(%esp), %ebx		/* Address of args is 1st arg.  */
 
-# ifdef __NR_mmap2
+#ifdef __NR_mmap2
 	jmp L(do_syscall)
-# else
+#else
 
 	/* Do the system call trap.  */
 	int $0x80
@@ -115,7 +114,6 @@ L(pseudo_end):
 L(einval):
 	movl $-EINVAL, %eax
 	jmp SYSCALL_ERROR_LABEL
-# endif
 #endif
 
 PSEUDO_END (__mmap64)
diff --git a/sysdeps/unix/sysv/linux/lxstat64.c b/sysdeps/unix/sysv/linux/lxstat64.c
index 3652c51336c..15ac694ee92 100644
--- a/sysdeps/unix/sysv/linux/lxstat64.c
+++ b/sysdeps/unix/sysv/linux/lxstat64.c
@@ -43,7 +43,7 @@ __lxstat64 (int vers, const char *name, struct stat64 *buf)
   int result;
 
 #ifdef __NR_lstat64
-  if (! have_no_stat64)
+  if (! __have_no_stat64)
     {
       int saved_errno = errno;
       result = INLINE_SYSCALL (lstat64, 2, name, buf);
@@ -52,7 +52,7 @@ __lxstat64 (int vers, const char *name, struct stat64 *buf)
 	return result;
 
       __set_errno (saved_errno);
-      have_no_stat64 = 1;
+      __have_no_stat64 = 1;
     }
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c
index 5c104939538..18cdca668d6 100644
--- a/sysdeps/unix/sysv/linux/xstat64.c
+++ b/sysdeps/unix/sysv/linux/xstat64.c
@@ -44,7 +44,7 @@ __xstat64 (int vers, const char *name, struct stat64 *buf)
   int result;
 
 #if defined __NR_stat64
-  if (! have_no_stat64)
+  if (! __have_no_stat64)
     {
       int saved_errno = errno;
       result = INLINE_SYSCALL (stat64, 2, name, buf);
@@ -53,7 +53,7 @@ __xstat64 (int vers, const char *name, struct stat64 *buf)
 	return result;
 
       __set_errno (saved_errno);
-      have_no_stat64 = 1;
+      __have_no_stat64 = 1;
     }
 #endif