From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13001 invoked by alias); 7 Oct 2007 14:47:40 -0000 Received: (qmail 12985 invoked by uid 22791); 7 Oct 2007 14:47:40 -0000 X-Spam-Check-By: sourceware.org Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.31) with ESMTP; Sun, 07 Oct 2007 14:47:36 +0000 Received: from Relay1.suse.de (mail2.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 982B622DC7 for ; Sun, 7 Oct 2007 16:47:33 +0200 (CEST) Received: from aj by arthur.inka.de with local (Exim 4.63) (envelope-from ) id 1IeXPn-0003Ry-1O for libc-hacker@sources.redhat.com; Sun, 07 Oct 2007 16:47:31 +0200 From: Andreas Jaeger To: GNU libc hackers Subject: Fix error.h problems OpenPGP: id=C272A126; url=http://www.suse.de/~aj/keys.txt Date: Sun, 07 Oct 2007 14:47:00 -0000 Message-ID: User-Agent: Gnus/5.110007 (No Gnus v0.7) Emacs/22.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2007-10/txt/msg00005.txt.bz2 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-length: 2447 Current cvs fails to build for me with: In file included from error.h:53, from error.c:39: ./bits/error.h:65: error: conflicting types for =E2=80=98error_at_line=E2= =80=99 error.h:37: error: previous declaration of =E2=80=98error_at_line=E2=80=99 = was here ./bits/error.h: In function =E2=80=98error_at_line=E2=80=99: ./bits/error.h:67: error: =E2=80=98__fname=E2=80=99 undeclared (first use i= n this function) ./bits/error.h:67: error: (Each undeclared identifier is reported only once ./bits/error.h:67: error: for each function it appears in.) ./bits/error.h:67: error: =E2=80=98__line=E2=80=99 undeclared (first use in= this function) make[2]: *** [/builds/glibc/4.3-nptl/misc/error.o] Error 1 Fixed by the appended patch. Another error later on: In file included from ../include/error.h:1, from cache.c:20: ../misc/error.h:53:25: error: bits/error.h: No such file or directory make[2]: *** [/builds/glibc/4.3-nptl/elf/cache.o] Error 1 fixed with creation of include/bits/error.h Ok to commit these? Andreas 2007-10-07 Andreas Jaeger * include/bits/error.h: New file. * misc/bits/error.h (error_at_line): Fix prototype. =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: include/bits/error.h --- include/bits/error.h created +++ include/bits/error.h 2007-10-07 16:30:24.000000000 +0200 1.1 @@ -0,0 +1 @@ +#include "../../misc/bits/error.h" Index: misc/bits/error.h --- bits/error.h 4 Oct 2007 18:01:24 -0000 1.2 +++ bits/error.h 7 Oct 2007 14:04:20 -0000 @@ -61,7 +61,8 @@ extern void __REDIRECT (__error_at_line_ /* If we know the function will never return make sure the compiler realizes that, too. */ __extern_always_inline void -error_at_line (int __status, int __errnum, const char *__format, ...) +error_at_line (int __status, int __errnum, const char *__fname,=20 + unsigned int __line, const char *__format, ...) { if (__builtin_constant_p (__status) && __status !=3D 0) __error_at_line_noreturn (__status, __errnum, __fname, __line, __forma= t, --=20 Andreas Jaeger, Director Platform/openSUSE, aj@suse.de SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG N=C3=BCrnberg) Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GPG fingerprint =3D 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126 --=-=-= Content-Type: application/pgp-signature Content-length: 188 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQFHCPGBOJpWPMJyoSYRAkXpAJ0eCZEapZncDjcWjSvoW3uDn0Aq2QCdGREf B8bMRsJ8xjXVwGQM7BQsOnQ= =DDlS -----END PGP SIGNATURE----- --=-=-=--