about summary refs log tree commit diff
path: root/wcsmbs
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 /wcsmbs
parent0e07fc00caf01bb0f70ad33ea3bf0686055f52e0 (diff)
downloadglibc-61995d3ed957937f013807529db63ddf29815053.tar.gz
glibc-61995d3ed957937f013807529db63ddf29815053.tar.xz
glibc-61995d3ed957937f013807529db63ddf29815053.zip
* 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 'wcsmbs')
-rw-r--r--wcsmbs/wcscoll.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/wcsmbs/wcscoll.c b/wcsmbs/wcscoll.c
index ed6db06e4e..ae3d48c623 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