[git commit future] fcntl[64]: change third argument type to long in the non-cancellable version

Peter S. Mazinger ps.m at gmx.net
Fri Apr 22 23:21:30 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=37bce80ab26018f470e98c6b58d81450d70301f0
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 include/fcntl.h                               |    4 ++--
 libc/sysdeps/linux/common/__syscall_fcntl.c   |    6 +++---
 libc/sysdeps/linux/common/__syscall_fcntl64.c |    6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/fcntl.h b/include/fcntl.h
index 38b28bb..f56423d 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -76,7 +76,7 @@ __BEGIN_DECLS
 #if !defined(__USE_FILE_OFFSET64) || defined(__LP64__)
 extern int fcntl (int __fd, int __cmd, ...);
 # ifdef _LIBC
-extern int __fcntl_nocancel(int, int, void *) attribute_hidden;
+extern int __fcntl_nocancel(int, int, long) attribute_hidden;
 libc_hidden_proto(fcntl)
 # endif
 #else
@@ -89,7 +89,7 @@ extern int __REDIRECT (fcntl, (int __fd, int __cmd, ...), fcntl64);
 #if defined(__USE_LARGEFILE64) && !defined(__LP64__)
 extern int fcntl64 (int __fd, int __cmd, ...);
 # ifdef _LIBC
-extern int __fcntl64_nocancel(int, int, void *) attribute_hidden;
+extern int __fcntl64_nocancel(int, int, long) attribute_hidden;
 libc_hidden_proto(fcntl64)
 # endif
 #endif
diff --git a/libc/sysdeps/linux/common/__syscall_fcntl.c b/libc/sysdeps/linux/common/__syscall_fcntl.c
index 5ae6122..77a2c37 100644
--- a/libc/sysdeps/linux/common/__syscall_fcntl.c
+++ b/libc/sysdeps/linux/common/__syscall_fcntl.c
@@ -14,7 +14,7 @@
 #include <fcntl.h>
 #include <bits/wordsize.h>
 
-int __NC(fcntl)(int fd, int cmd, void *arg)
+int __NC(fcntl)(int fd, int cmd, long arg)
 {
 #if __WORDSIZE == 32
 	if (cmd == F_GETLK64 || cmd == F_SETLK64 || cmd == F_SETLKW64) {
@@ -32,10 +32,10 @@ int __NC(fcntl)(int fd, int cmd, void *arg)
 int fcntl(int fd, int cmd, ...)
 {
 	va_list ap;
-	void *arg;
+	long arg;
 
 	va_start (ap, cmd);
-	arg = va_arg (ap, void *);
+	arg = va_arg (ap, long);
 	va_end (ap);
 
 	if (SINGLE_THREAD_P || (cmd != F_SETLKW && cmd != F_SETLKW64))
diff --git a/libc/sysdeps/linux/common/__syscall_fcntl64.c b/libc/sysdeps/linux/common/__syscall_fcntl64.c
index f84cc57..5174d8a 100644
--- a/libc/sysdeps/linux/common/__syscall_fcntl64.c
+++ b/libc/sysdeps/linux/common/__syscall_fcntl64.c
@@ -17,15 +17,15 @@
 # include <cancel.h>
 
 # define __NR___fcntl64_nocancel __NR_fcntl64
-_syscall3(int, __NC(fcntl64), int, fd, int, cmd, void *, arg)
+_syscall3(int, __NC(fcntl64), int, fd, int, cmd, long, arg)
 
 int fcntl64(int fd, int cmd, ...)
 {
-	void *arg;
+	long arg;
 	va_list list;
 
 	va_start(list, cmd);
-	arg = va_arg(list, void *);
+	arg = va_arg(list, long);
 	va_end(list);
 
 	if (SINGLE_THREAD_P || (cmd != F_SETLKW64))
-- 
1.7.3.4



More information about the uClibc-cvs mailing list