[PATCH] Fix build with latest GCC 4

Greg McGary greg@mcgary.org
Fri Mar 25 20:02:00 GMT 2005


Jakub Jelinek <jakub@redhat.com> writes:

> Hi!
> 
> wordsize-64/wcstoul_l.c includes generic/wcstoul_l.c which
> in turn includes wordsize-64/wcstol_l.c.  But the aliases
> and libc_hidden_ver for strtol_l.c are not desirable in the ul compilation.

This can also be fixed by short-cutting the diversion through
wordsize-64/wcstol_l.c, by including generic/wcstol_l.c directly from
generic/wcstoul_l.c:

Greg

2005-03-25  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/generic/wcstoul_l.c: Include generic/wcstol_l.c,
        bypassing wordsize-64/wcstol_l.c in the 64-bit case.

Index: wcstoul_l.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/generic/wcstoul_l.c,v
retrieving revision 1.4
diff -u -p -r1.4 wcstoul_l.c
--- wcstoul_l.c	14 Mar 2004 20:58:49 -0000	1.4
+++ wcstoul_l.c	25 Mar 2005 19:25:30 -0000
@@ -27,4 +27,4 @@
 extern unsigned long int ____wcstoul_l_internal (const wchar_t *, wchar_t **,
 						 int, int, __locale_t);
 
-#include <wcstol_l.c>
+#include <sysdeps/generic/wcstol_l.c>



More information about the Libc-hacker mailing list