svn commit: branches/uClibc-nptl/libc/sysdeps/linux/common

sjhill at uclibc.org sjhill at uclibc.org
Mon Aug 21 03:59:01 UTC 2006


Author: sjhill
Date: 2006-08-20 20:59:01 -0700 (Sun, 20 Aug 2006)
New Revision: 15860

Log:
Merge from trunk.


Modified:
   branches/uClibc-nptl/libc/sysdeps/linux/common/__syscall_fcntl64.c


Changeset:
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/__syscall_fcntl64.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/__syscall_fcntl64.c	2006-08-21 03:49:24 UTC (rev 15859)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/__syscall_fcntl64.c	2006-08-21 03:59:01 UTC (rev 15860)
@@ -2,7 +2,7 @@
 /*
  * __syscall_fcntl64() for uClibc
  *
- * Copyright (C) 2000-2005 Erik Andersen <andersen at uclibc.org>
+ * Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
  *
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
@@ -12,10 +12,12 @@
 #include <fcntl.h>
 
 #if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64
-#undef fcntl64
+extern __typeof(fcntl64) __libc_fcntl64;
+libc_hidden_proto(__libc_fcntl64)
+
 #define __NR___syscall_fcntl64 __NR_fcntl64
 static inline _syscall3(int, __syscall_fcntl64, int, fd, int, cmd, long, arg);
-int attribute_hidden __fcntl64(int fd, int cmd, ...)
+int __libc_fcntl64(int fd, int cmd, ...)
 {
 	long arg;
 	va_list list;
@@ -26,6 +28,9 @@
 	va_end(list);
 	return (__syscall_fcntl64(fd, cmd, arg));
 }
-strong_alias(__fcntl64,fcntl64)
-weak_alias(__fcntl64,__libc_fcntl64)
+libc_hidden_def(__libc_fcntl64)
+
+libc_hidden_proto(fcntl64)
+strong_alias(__libc_fcntl64,fcntl64)
+libc_hidden_weak(fcntl64)
 #endif




More information about the uClibc-cvs mailing list