summaryrefslogtreecommitdiff
path: root/string
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-03-17 21:06:39 +0000
committerRoland McGrath <roland@gnu.org>2005-03-17 21:06:39 +0000
commit61995d3ed957937f013807529db63ddf29815053 (patch)
tree2a0b3ed4e5ad392a81d7dc8539a2600b5abcdbf7 /string
parent0e07fc00caf01bb0f70ad33ea3bf0686055f52e0 (diff)
downloadglibc-61995d3ed957937f013807529db63ddf29815053.tar.gz
* include/libc-symbols.h (__hidden_proto): Remove bogus declaration
of internal. (__hidden_def1, __hidden_dot_def1): Remove. (__hidden_def2, __hidden_def3): Remove. (__hidden_ver1): New. (hidden_ver, hidden_def, hidden_weak): Use it. (hidden_data_ver, hidden_data_ver, hidden_data_weak): Use non-data version of the macro. * 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.
Diffstat (limited to 'string')
-rw-r--r--string/strcoll.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/string/strcoll.c b/string/strcoll.c
index 8a73cae564..8e8fdc7792 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