On Friday 30 May 2008 23:52, Bernhard Fischer wrote:
> On Fri, May 30, 2008 at 10:55:03PM +0200, Denys Vlasenko wrote:
> >On Friday 30 May 2008 20:35, Bernhard Fischer wrote:
> >> On Mon, May 19, 2008 at 03:57:36PM -0700, [EMAIL PROTECTED] wrote:
> >> >Author: vda
> >> >Date: 2008-05-19 15:57:34 -0700 (Mon, 19 May 2008)
> >> >New Revision: 22012
> >> >
> >> >Log:
> >> >Moving libc_hidden_proto's into #ifdef UCLIBC_INTERNAL block
> >> >in string.h and strings.h. This caught unguarded string ops in
> >> >libc/inet/ethers.c __ether_line_w() function.
> >> >
> >> >I will wait for fallout reports for a week or so,
> >> >then continue converting more libc_hidden_proto's.
> >>
> >> CC libc/string/wcscasecmp.os
> >> libc/string/strcasecmp.c:45: error: '__EI_wcscasecmp' aliased to undefined
> >> symbol '__GI_wcscasecmp'
> >
> >.config?
>
> sorry. Attached now.
Thanks. The attached patch fixes it (I applied it to uclibc svn).
--
vda
diff -d -urpN uClibc.4/libc/string/strcasecmp.c uClibc.5/libc/string/strcasecmp.c
--- uClibc.4/libc/string/strcasecmp.c 2008-05-19 20:27:05.000000000 +0200
+++ uClibc.5/libc/string/strcasecmp.c 2008-05-31 12:43:55.000000000 +0200
@@ -13,6 +13,8 @@
#ifdef WANT_WIDE
# define strcasecmp wcscasecmp
# define strcasecmp_l wcscasecmp_l
+libc_hidden_proto(wcscasecmp)
+libc_hidden_proto(wcscasecmp_l)
# ifdef __UCLIBC_DO_XLOCALE
libc_hidden_proto(towlower_l)
# define TOLOWER(C) towlower_l((C), locale_arg)
@@ -21,6 +23,8 @@ libc_hidden_proto(towlower)
# define TOLOWER(C) towlower((C))
# endif
#else
+/* Experimentally off - libc_hidden_proto(strcasecmp) */
+/* Experimentally off - libc_hidden_proto(strcasecmp_l) */
# ifdef __UCLIBC_DO_XLOCALE
libc_hidden_proto(tolower_l)
# define TOLOWER(C) tolower_l((C), locale_arg)
@@ -35,9 +39,6 @@ libc_hidden_proto(tolower)
#if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE)
-/* Experimentally off - libc_hidden_proto(strcasecmp_l) */
-
-/* Experimentally off - libc_hidden_proto(strcasecmp) */
int strcasecmp(register const Wchar *s1, register const Wchar *s2)
{
return strcasecmp_l(s1, s2, __UCLIBC_CURLOCALE);
@@ -46,7 +47,7 @@ libc_hidden_def(strcasecmp)
#else /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */
-libc_hidden_proto(__XL_NPP(strcasecmp))
+/* Experimentally off - libc_hidden_proto(__XL_NPP(strcasecmp)) */
int __XL_NPP(strcasecmp)(register const Wchar *s1, register const Wchar *s2
__LOCALE_PARAM )
{
diff -d -urpN uClibc.4/libc/string/strncasecmp.c uClibc.5/libc/string/strncasecmp.c
--- uClibc.4/libc/string/strncasecmp.c 2008-05-19 20:27:05.000000000 +0200
+++ uClibc.5/libc/string/strncasecmp.c 2008-05-31 12:43:55.000000000 +0200
@@ -13,6 +13,8 @@
#ifdef WANT_WIDE
# define strncasecmp wcsncasecmp
# define strncasecmp_l wcsncasecmp_l
+libc_hidden_proto(wcsncasecmp)
+libc_hidden_proto(wcsncasecmp_l)
# ifdef __UCLIBC_DO_XLOCALE
libc_hidden_proto(towlower_l)
# define TOLOWER(C) towlower_l((C), locale_arg)
@@ -21,6 +23,8 @@ libc_hidden_proto(towlower)
# define TOLOWER(C) towlower((C))
# endif
#else
+/* Experimentally off - libc_hidden_proto(strncasecmp) */
+/* Experimentally off - libc_hidden_proto(strncasecmp_l) */
# ifdef __UCLIBC_DO_XLOCALE
libc_hidden_proto(tolower_l)
# define TOLOWER(C) tolower_l((C), locale_arg)
@@ -35,9 +39,6 @@ libc_hidden_proto(tolower)
#if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE)
-/* Experimentally off - libc_hidden_proto(strncasecmp_l) */
-
-/* Experimentally off - libc_hidden_proto(strncasecmp) */
int strncasecmp(register const Wchar *s1, register const Wchar *s2, size_t n)
{
return strncasecmp_l(s1, s2, n, __UCLIBC_CURLOCALE);
@@ -46,7 +47,7 @@ libc_hidden_def(strncasecmp)
#else /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */
-libc_hidden_proto(__XL_NPP(strncasecmp))
+/* Experimentally off - libc_hidden_proto(__XL_NPP(strncasecmp)) */
int __XL_NPP(strncasecmp)(register const Wchar *s1, register const Wchar *s2,
size_t n __LOCALE_PARAM )
{
_______________________________________________
uClibc mailing list
[email protected]
http://busybox.net/cgi-bin/mailman/listinfo/uclibc
