summary refs log tree commit diff
path: root/wcsmbs/wcscoll.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-12-31 00:04:07 +0000
committerUlrich Drepper <drepper@redhat.com>1999-12-31 00:04:07 +0000
commit83d660c76fb1287f2cd9e6b94ddccb7069a6fae5 (patch)
tree487671d11bec5118f65a145ef262b2a49b11d098 /wcsmbs/wcscoll.c
parent9eb157c8750f70adc4c35f09127055444672b63d (diff)
downloadglibc-83d660c76fb1287f2cd9e6b94ddccb7069a6fae5.tar.gz
glibc-83d660c76fb1287f2cd9e6b94ddccb7069a6fae5.tar.xz
glibc-83d660c76fb1287f2cd9e6b94ddccb7069a6fae5.zip
Update.
1999-12-30  Ulrich Drepper  <drepper@cygnus.com>

	* wcsmbs/wcscoll.c: Use multibyte character version.
	* wcsmbs/wcsxfrm.c: Likewise.
	* string/strcoll.c: Prepare to be used for the wide character version.
	* string/strxfrm.c: Likewise.
	* locale/weightwc.h: New file.
Diffstat (limited to 'wcsmbs/wcscoll.c')
-rw-r--r--wcsmbs/wcscoll.c24
1 files changed, 8 insertions, 16 deletions
diff --git a/wcsmbs/wcscoll.c b/wcsmbs/wcscoll.c
index b5b6f5cb45..1dfe93918b 100644
--- a/wcsmbs/wcscoll.c
+++ b/wcsmbs/wcscoll.c
@@ -19,26 +19,18 @@
 
 #include <wchar.h>
 
+#define STRING_TYPE wchar_t
+#define USTRING_TYPE wint_t
 #ifdef USE_IN_EXTENDED_LOCALE_MODEL
 # define STRCOLL __wcscoll_l
 #else
 # define STRCOLL wcscoll
 #endif
 #define STRCMP wcscmp
+#define STRLEN wcslen
+#define WEIGHT_H "../locale/weightwc.h"
+#define SUFFIX	WC
+#define L(arg) L##arg
+#define WIDE_CHAR_VERSION 1
 
-
-#ifndef USE_IN_EXTENDED_LOCALE_MODEL
-int
-STRCOLL (s1, s2)
-     const wchar_t *s1;
-     const wchar_t *s2;
-#else
-int
-STRCOLL (s1, s2, l)
-     const wchar_t *s1;
-     const wchar_t *s2;
-     __locale_t l;
-#endif
-{
-  return STRCMP (s1, s2);
-}
+#include "../string/strcoll.c"