From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19126 invoked by alias); 5 Sep 2003 05:13:58 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 19110 invoked from network); 5 Sep 2003 05:13:57 -0000 Received: from unknown (HELO Cantor.suse.de) (195.135.220.2) by sources.redhat.com with SMTP; 5 Sep 2003 05:13:57 -0000 Received: from Hermes.suse.de (Hermes.suse.de [195.135.221.8]) (using TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits)) (No client certificate requested) by Cantor.suse.de (Postfix) with ESMTP id 6035B15B376B for ; Fri, 5 Sep 2003 07:13:57 +0200 (CEST) Received: from aj by arthur.inka.de with local (Exim 4.12) id 19v8ux-0007fs-00 for libc-hacker@sources.redhat.com; Fri, 05 Sep 2003 07:13:55 +0200 To: GNU libc hacker Subject: Fix i386/fcntl.c From: Andreas Jaeger Date: Fri, 05 Sep 2003 05:13:00 -0000 Message-ID: User-Agent: Gnus/5.1003 (Gnus v5.10.3) XEmacs/21.4 (Rational FORTRAN, linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" X-SW-Source: 2003-09/txt/msg00016.txt.bz2 --=-=-= Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Content-length: 1375 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 * 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. =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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; =20 =20 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 =3D va_arg (ap, void *); + va_end (ap); + #if __ASSUME_FCNTL64 =3D=3D 0 # ifdef __NR_fcntl64 if (! __have_no_fcntl64) --=20 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj SuSE Linux AG, Deutschherrnstr. 15-19, 90429 N=FCrnberg, Germany GPG fingerprint =3D 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126 --=-=-= Content-Type: application/pgp-signature Content-length: 197 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2-rc1-SuSE (GNU/Linux) iD8DBQA/WBuTOJpWPMJyoSYRAjJiAJ45OLEQnyFjvPs3t4udTkiXl8dvAQCfTz5V KgU+4ih5XL6UufqBLE8dAnM= =2ytC -----END PGP SIGNATURE----- --=-=-=--