yann@1: 
yann@1: Fixes? the following error when building with gcc-4.0.0:
yann@1: 
yann@1: ../string/strcoll.c:39: error: '__EI_strcoll' aliased to undefined symbol '__GI_strcoll'
yann@1: make[2]: *** [/home/dank/crosstool-0.32/build/i686-unknown-linux-gnu/gcc-4.0.0-20050410-glibc-2.3.4/build-glibc/wcsmbs/wcscoll.os] Error 1
yann@1: make[2]: Leaving directory `/home/dank/crosstool-0.32/build/i686-unknown-linux-gnu/gcc-4.0.0-20050410-glibc-2.3.4/glibc-2.3.4/wcsmbs'
yann@1: 
yann@1: 
yann@1: Thu Mar 17 21:06:24 2005 UTC (3 weeks, 5 days ago) by roland
yann@1: Branch: MAIN
yann@1: CVS Tags: fedora-glibc-20050405T2114, fedora-glibc-20050401T1444, fedora-glibc-20050324T0715, fedora-glibc-20050319T1907, HEAD
yann@1: 
yann@1: 2005-03-16  Richard Henderson  <rth@redhat.com>
yann@1: 
yann@1: 	* include/wchar.h (__wcscoll): Remove.
yann@1: 	* wcsmbs/wcscoll.c: Define wcscoll directly instead of via __wcscoll.
yann@1: 	* string/strcoll.c: Don't issue libc_hidden_def STRCOLL redefined.
yann@1: 
yann@1: http://sourceware.org/cgi-bin/cvsweb.cgi/libc/string/strcoll.c.diff?r1=1.33&r2=1.34&cvsroot=glibc
yann@1: http://sourceware.org/cgi-bin/cvsweb.cgi/libc/include/wchar.h.diff?r1=1.26&r2=1.27&cvsroot=glibc
yann@1: http://sourceware.org/cgi-bin/cvsweb.cgi/libc/wcsmbs/wcscoll.c.diff?r1=1.13&r2=1.14&cvsroot=glibc
yann@1: 
yann@1: ===================================================================
yann@1: RCS file: /cvs/glibc/libc/string/strcoll.c,v
yann@1: retrieving revision 1.33
yann@1: retrieving revision 1.34
yann@1: diff -u -r1.33 -r1.34
yann@1: --- libc/string/strcoll.c	2004/03/14 20:51:30	1.33
yann@1: +++ libc/string/strcoll.c	2005/03/17 21:06:24	1.34
yann@1: @@ -23,6 +23,7 @@
yann@1:  # define STRING_TYPE char
yann@1:  # define STRCOLL strcoll
yann@1:  # define STRCOLL_L __strcoll_l
yann@1: +# define USE_HIDDEN_DEF
yann@1:  #endif
yann@1:  
yann@1:  #include "../locale/localeinfo.h"
yann@1: @@ -35,6 +36,7 @@
yann@1:  {
yann@1:    return STRCOLL_L (s1, s2, _NL_CURRENT_LOCALE);
yann@1:  }
yann@1: -#if !defined WIDE_CHAR_VERSION
yann@1: -libc_hidden_def (strcoll)
yann@1: +
yann@1: +#ifdef USE_HIDDEN_DEF
yann@1: +libc_hidden_def (STRCOLL)
yann@1:  #endif
yann@1: ===================================================================
yann@1: RCS file: /cvs/glibc/libc/include/wchar.h,v
yann@1: retrieving revision 1.26
yann@1: retrieving revision 1.27
yann@1: diff -u -r1.26 -r1.27
yann@1: --- libc/include/wchar.h	2004/03/14 20:45:10	1.26
yann@1: +++ libc/include/wchar.h	2005/03/17 21:06:24	1.27
yann@1: @@ -56,7 +56,6 @@
yann@1:  extern int __wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2,
yann@1:  			  size_t __n)
yann@1:       __attribute_pure__;
yann@1: -extern int __wcscoll (__const wchar_t *__s1, __const wchar_t *__s2);
yann@1:  extern size_t __wcslen (__const wchar_t *__s) __attribute_pure__;
yann@1:  extern size_t __wcsnlen (__const wchar_t *__s, size_t __maxlen)
yann@1:       __attribute_pure__;
yann@1: ===================================================================
yann@1: RCS file: /cvs/glibc/libc/wcsmbs/wcscoll.c,v
yann@1: retrieving revision 1.13
yann@1: retrieving revision 1.14
yann@1: diff -u -r1.13 -r1.14
yann@1: --- libc/wcsmbs/wcscoll.c	2004/03/14 21:05:48	1.13
yann@1: +++ libc/wcsmbs/wcscoll.c	2005/03/17 21:06:24	1.14
yann@1: @@ -22,12 +22,11 @@
yann@1:  
yann@1:  #define STRING_TYPE wchar_t
yann@1:  #define USTRING_TYPE wint_t
yann@1: -#define STRCOLL __wcscoll
yann@1: +#define STRCOLL wcscoll
yann@1:  #define STRCOLL_L __wcscoll_l
yann@1:  
yann@1:  #include "../string/strcoll.c"
yann@1:  
yann@1:  #ifndef USE_IN_EXTENDED_LOCALE_MODEL
yann@1: -weak_alias (__wcscoll, wcscoll)
yann@1:  libc_hidden_weak (wcscoll)
yann@1:  #endif