This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Fix i386/fcntl.c

building glibc fails with:
../sysdeps/unix/sysv/linux/i386/fcntl.c:36: error: conflicting types for '__fcntl_nocancel'
../include/fcntl.h:12: error: previous declaration of '__fcntl_nocancel'
make[2]: *** [/builds/glibc/gcc-3.4/io/fcntl.o] Error 1

Ok to commit?

Andreas

2003-09-05  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/i386/fcntl.c (__fcntl_nocancel): Change
	prototype to use variable argument lists and get the possible one
	argument via va_arg.


============================================================
Index: sysdeps/unix/sysv/linux/i386/fcntl.c
--- sysdeps/unix/sysv/linux/i386/fcntl.c	4 Sep 2003 13:38:44 -0000	1.17
+++ sysdeps/unix/sysv/linux/i386/fcntl.c	5 Sep 2003 05:12:12 -0000
@@ -32,8 +32,15 @@ int __have_no_fcntl64;
 
 
 int
-__fcntl_nocancel (int fd, int cmd, void *arg)
+__fcntl_nocancel (int fd, int cmd, ...)
 {
+  va_list ap;
+  void *arg;
+
+  va_start (ap, cmd);
+  arg = va_arg (ap, void *);
+  va_end (ap);
+
 #if __ASSUME_FCNTL64 == 0
 # ifdef __NR_fcntl64
   if (! __have_no_fcntl64)

-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SuSE Linux AG, Deutschherrnstr. 15-19, 90429 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

Attachment: pgp00000.pgp
Description: PGP signature

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]