From b25ad630be8b0f362fea44a97efbead83d1dd2ae Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Mon, 16 Jan 2006 18:07:18 +0000 Subject: Last relocs jump and global data, (even locales) that I could remove are gone from libc. The remaining are left as exercise for others ;-) --- libc/string/_collate.c | 2 ++ libc/string/psignal.c | 1 + libc/string/strcasecmp.c | 3 +++ libc/string/strcasestr.c | 5 +++++ libc/string/strncasecmp.c | 3 +++ 5 files changed, 14 insertions(+) (limited to 'libc/string') diff --git a/libc/string/_collate.c b/libc/string/_collate.c index 3009e4ebf..42216e9e4 100644 --- a/libc/string/_collate.c +++ b/libc/string/_collate.c @@ -57,6 +57,8 @@ libc_hidden_proto(wcscmp) #endif /* defined(L_strxfrm) || defined(L_strxfrm_l) */ +libc_hidden_proto(__global_locale) + #if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) libc_hidden_proto(wcscoll_l) diff --git a/libc/string/psignal.c b/libc/string/psignal.c index daf9764b1..64b52c98b 100644 --- a/libc/string/psignal.c +++ b/libc/string/psignal.c @@ -12,6 +12,7 @@ libc_hidden_proto(fprintf) libc_hidden_proto(strsignal) +libc_hidden_proto(stderr) /* TODO: make this threadsafe with a reentrant version of strsignal? */ diff --git a/libc/string/strcasecmp.c b/libc/string/strcasecmp.c index 333d3159c..ac3f562a7 100644 --- a/libc/string/strcasecmp.c +++ b/libc/string/strcasecmp.c @@ -24,6 +24,9 @@ libc_hidden_proto(towlower) libc_hidden_proto(tolower_l) # define TOLOWER(C) tolower_l((C), locale_arg) # else +#ifndef __UCLIBC_HAS_XLOCALE__ +libc_hidden_proto(__ctype_tolower) +#endif libc_hidden_proto(tolower) # define TOLOWER(C) tolower((C)) # endif diff --git a/libc/string/strcasestr.c b/libc/string/strcasestr.c index d835440ec..72c1e4702 100644 --- a/libc/string/strcasestr.c +++ b/libc/string/strcasestr.c @@ -8,6 +8,11 @@ #include "_string.h" #include +#ifndef __UCLIBC_HAS_XLOCALE__ +libc_hidden_proto(__ctype_tolower) +#else +libc_hidden_proto(__ctype_tolower_loc) +#endif libc_hidden_proto(tolower) char *strcasestr(const char *s1, const char *s2) diff --git a/libc/string/strncasecmp.c b/libc/string/strncasecmp.c index 2133b4ebd..54de1b78c 100644 --- a/libc/string/strncasecmp.c +++ b/libc/string/strncasecmp.c @@ -24,6 +24,9 @@ libc_hidden_proto(towlower) libc_hidden_proto(tolower_l) # define TOLOWER(C) tolower_l((C), locale_arg) # else +#ifndef __UCLIBC_HAS_XLOCALE__ +libc_hidden_proto(__ctype_tolower) +#endif libc_hidden_proto(tolower) # define TOLOWER(C) tolower((C)) # endif -- cgit v1.2.3