diff options
| author | Roland McGrath <roland@gnu.org> | 1996-03-28 09:16:15 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-03-28 09:16:15 +0000 |
| commit | 0393dfd6c22d4f3bb61c4650e4c22e87026b19bd (patch) | |
| tree | 6191705921900f148158c834b1a9cb095ffc8475 /string | |
| parent | 19bc17a90548ee427035994bbc4b14395723ff1f (diff) | |
* 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.
Diffstat (limited to 'string')
| -rw-r--r-- | string/strcoll.c | 3 | ||||
| -rw-r--r-- | string/strxfrm.c | 14 |
2 files changed, 7 insertions, 10 deletions
diff --git a/string/strcoll.c b/string/strcoll.c index 13e9f0d132..f5e2458a9f 100644 --- a/string/strcoll.c +++ b/string/strcoll.c @@ -20,7 +20,6 @@ Boston, MA 02111-1307, USA. */ #include <stddef.h> #include <stdlib.h> #include <string.h> -#include "localeinfo.h" #ifndef STRING_TYPE # define STRING_TYPE char @@ -30,7 +29,7 @@ Boston, MA 02111-1307, USA. */ /* Include the shared helper functions. `strxfrm'/`wcsxfrm' also use these functions. */ -#include "weight.h" +#include "../locale/weight.h" /* Compare S1 and S2, returning less than, equal to or diff --git a/string/strxfrm.c b/string/strxfrm.c index 7dce9c117f..7824ad8b09 100644 --- a/string/strxfrm.c +++ b/string/strxfrm.c @@ -20,7 +20,6 @@ Boston, MA 02111-1307, USA. */ #include <stddef.h> #include <stdlib.h> #include <string.h> -#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. */ |