From 0393dfd6c22d4f3bb61c4650e4c22e87026b19bd Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 28 Mar 1996 09:16:15 +0000 Subject: * locale/programs/xmalloc.c: Test _LIBC as well as STDC_HEADERS. * locale/programs/ld-collate.c (collate_finish): Use error_at_line instead of error_with_loc. * locale/weight.h: Use u_int32_t instead of u32_t. * string/strxfrm.c: Likewise. * string/strxfrm.c: Find weight.h in ../locale; don't #include "localeinfo.h". * string/strcoll.c: Likewise. * locale/programs/simple-hash.c, locale/programs/simple-hash.h, locale/programs/xmalloc.c, locale/programs/xstrdup.c: Helper functions for locale related programs. locale/programs/charmap.c, locale/programs/charset.c, locale/programs/charset.h, locale/programs/config.h, locale/programs/ctypedump.c, locale/programs/ld-collate.c, locale/programs/ld-ctype.c, locale/programs/ld-messages.c, locale/programs/ld-monetary.c, locale/programs/ld-numeric.c, locale/programs/ld-time.c, locale/programs/linereader.c, locale/programs/linereader.h, locale/programs/locale.c, locale/programs/localedef.c, locale/programs/locales.h, locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h, locale/programs/locfile-token.h, locale/programs/locfile.c, locale/programs/locfile.h, locale/programs/stringtrans.c, locale/programs/stringtrans.h: Implementation of locale related programs. --- string/strxfrm.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'string/strxfrm.c') diff --git a/string/strxfrm.c b/string/strxfrm.c index 7dce9c1..7824ad8 100644 --- a/string/strxfrm.c +++ b/string/strxfrm.c @@ -20,7 +20,6 @@ Boston, MA 02111-1307, USA. */ #include #include #include -#include "localeinfo.h" #ifndef STRING_TYPE # define STRING_TYPE char @@ -32,16 +31,15 @@ Boston, MA 02111-1307, USA. */ /* Include the shared helper functions. `strxfrm'/`wcsxfrm' also use these functions. */ -#include "weight.h" +#include "../locale/weight.h" /* Write 32 bit value UTF-8 encoded but only if enough space is left. */ static __inline size_t -print_val (value, dest, max, act) - u32_t value; - STRING_TYPE *dest; - size_t max; - size_t act; +print_val (u_int32_t value, + STRING_TYPE *dest, + size_t max, + size_t act) { char tmp[6]; int idx = 0; @@ -139,7 +137,7 @@ STRXFRM (dest, src, n) do { int ignore = 0; - u32_t w; + u_int32_t w; /* Here we have to check for IGNORE entries. If these are found we count them and go on witht he next value. */ -- cgit v1.1