diff options
| author | Roland McGrath <roland@gnu.org> | 2005-10-17 04:52:44 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-10-17 04:52:44 +0000 |
| commit | e8fc698f37f18b848f990038b8a9b15d789f7b57 (patch) | |
| tree | 7ba25aea84180dd49956cc4bfebe5fd77189e302 | |
| parent | 429f5637242900669167b72c5b9511d12b2bf7c8 (diff) | |
| download | glibc-e8fc698f37f18b848f990038b8a9b15d789f7b57.zip glibc-e8fc698f37f18b848f990038b8a9b15d789f7b57.tar.gz glibc-e8fc698f37f18b848f990038b8a9b15d789f7b57.tar.bz2 | |
2005-03-16 Richard Henderson <rth@redhat.com>
[BZ #721]
* include/wchar.h (__wcscoll): Remove.
* wcsmbs/wcscoll.c: Define wcscoll directly instead of via __wcscoll.
* string/strcoll.c: Don't issue libc_hidden_def STRCOLL redefined.
| -rw-r--r-- | include/wchar.h | 1 | ||||
| -rw-r--r-- | string/strcoll.c | 6 | ||||
| -rw-r--r-- | wcsmbs/wcscoll.c | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/wchar.h b/include/wchar.h index 73bd4a8..0f91114 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -56,7 +56,6 @@ extern int __wcscasecmp (__const wchar_t *__s1, __const wchar_t *__s2) extern int __wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2, size_t __n) __attribute_pure__; -extern int __wcscoll (__const wchar_t *__s1, __const wchar_t *__s2); extern size_t __wcslen (__const wchar_t *__s) __attribute_pure__; extern size_t __wcsnlen (__const wchar_t *__s, size_t __maxlen) __attribute_pure__; diff --git a/string/strcoll.c b/string/strcoll.c index 8a73cae..8e8fdc7 100644 --- a/string/strcoll.c +++ b/string/strcoll.c @@ -23,6 +23,7 @@ # define STRING_TYPE char # define STRCOLL strcoll # define STRCOLL_L __strcoll_l +# define USE_HIDDEN_DEF #endif #include "../locale/localeinfo.h" @@ -35,6 +36,7 @@ STRCOLL (s1, s2) { return STRCOLL_L (s1, s2, _NL_CURRENT_LOCALE); } -#if !defined WIDE_CHAR_VERSION -libc_hidden_def (strcoll) + +#ifdef USE_HIDDEN_DEF +libc_hidden_def (STRCOLL) #endif diff --git a/wcsmbs/wcscoll.c b/wcsmbs/wcscoll.c index ed6db06..ae3d48c 100644 --- a/wcsmbs/wcscoll.c +++ b/wcsmbs/wcscoll.c @@ -22,12 +22,11 @@ #define STRING_TYPE wchar_t #define USTRING_TYPE wint_t -#define STRCOLL __wcscoll +#define STRCOLL wcscoll #define STRCOLL_L __wcscoll_l #include "../string/strcoll.c" #ifndef USE_IN_EXTENDED_LOCALE_MODEL -weak_alias (__wcscoll, wcscoll) libc_hidden_weak (wcscoll) #endif |