Fix error.h problems

Fix error.h problems

[Andreas Jaeger]

[-- Attachment #1: Type: text/plain, Size: 2296 bytes --]


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 ‘error_at_line’
error.h:37: error: previous declaration of ‘error_at_line’ was here
./bits/error.h: In function ‘error_at_line’:
./bits/error.h:67: error: ‘__fname’ undeclared (first use in 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: ‘__line’ 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  <aj@suse.de>

	* include/bits/error.h: New file.

	* misc/bits/error.h (error_at_line): Fix prototype.

============================================================
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, 
+	       unsigned int __line, const char *__format, ...)
 {
   if (__builtin_constant_p (__status) && __status != 0)
     __error_at_line_noreturn (__status, __errnum, __fname, __line, __format,

-- 
 Andreas Jaeger, Director Platform/openSUSE, aj@suse.de
  SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg)
   Maxfeldstr. 5, 90409 Nürnberg, Germany
    GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]

Re: Fix error.h problems

[Ulrich Drepper]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Andreas Jaeger wrote:
> Ok to commit these?

Yes.  But I did it myself since I fixed another set of problems in these
files.

- --
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)

iD8DBQFHCRef2ijCOnn/RHQRAispAJ9BRkUszFmnV0xyWH+vsa/0p2vETACfe8em
ccU4cvNYTHM17nBX1rrvesE=
=jRiA
-----END PGP SIGNATURE-----