From 5358d026c74d1227271c190f0070fc90ef789829 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 26 Dec 1999 07:29:11 +0000 Subject: Update. * locale/programs/ld-collate.c (read_directions): Fix a few messages. (collate_finish): Test that position is used in all sections for a level or in none. * string/strxfrm.c: Optimize a bit. We don't need the highest bit of the index returned by findidx. * string/strcoll.c: Complete rewrite for new collate implementation. * wcsmbs/wcscoll.c: Don't use strcoll.c, implement dummy implementation locally. --- wcsmbs/wcscoll.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'wcsmbs') diff --git a/wcsmbs/wcscoll.c b/wcsmbs/wcscoll.c index 27031786cd..b5b6f5cb45 100644 --- a/wcsmbs/wcscoll.c +++ b/wcsmbs/wcscoll.c @@ -1,6 +1,6 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1996. + Contributed by Ulrich Drepper , 1996. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -19,8 +19,6 @@ #include -#define STRING_TYPE wchar_t -#define USTRING_TYPE wint_t #ifdef USE_IN_EXTENDED_LOCALE_MODEL # define STRCOLL __wcscoll_l #else @@ -28,4 +26,19 @@ #endif #define STRCMP wcscmp -#include + +#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); +} -- cgit 1.4.1