From 4a33c2f55eab04206e22ab972a77f62486fe5a97 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 13 Sep 1999 09:07:36 +0000 Subject: Update. 1999-09-13 Ulrich Drepper * locale/langinfo.h: Remove byte-order dependent names. * locale/categories.def: Update after removal of byte-order dependent names. * locale/loadlocale.c (_nl_load_locale): Don't allow locale files with magic number in other byte order. * locale/newlocale.c (__newlocale): Remove byte-order dependent code. * locale/C-collate.c: Remove initializers for other byte-order. * locale/C-ctype.c: Likewise. * locale/C-monetary.c: Likewise. * locale/C-paper.c: Likewise. * locale/C-time.c: Likewise. * locale/lc-collate.c: Remove byte-order oriented initialization. * locale/lc-ctype.c: Likewise. * locale/lc-monetary.c: Likewise. * locale/lc-time.c: Likewise. * locale/programs/ld-address.c: Don't generate output in both byte-orders. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-paper.c: Likewise. * locale/programs/ld-time.c: Likewise. * time/strftime.c (NLW): Don't use different byte-orders. * wctype/cname-lookup.h (cname_lookup): Likewise. * Makeconfig (localedir): Define using libdir, not datadir. (msgcatdir): New variable. * catgets/Makefile (CPPFLAGS): Define NLSPATH using msgcatdir. * elf/Makefile (bash-ldd-rewrite): Replace @TEXTDOMAINDIR@ using msgcatdir. * intl/Makefile (install-others): Install locale.alias in msgcatdir. (CPPFLAGS): Define paths using msgcatdir. * locale/Makefile (CPPFLAGS): Define LOCALE_ALIAS_PATH using msgcatdir. * po/Makefile (mo-installed): Define using msgcatdir. * sysdeps/unix/sysv/linux/net/if_arp.h: Fix typo. --- locale/C-collate.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'locale/C-collate.c') diff --git a/locale/C-collate.c b/locale/C-collate.c index 616fed1e3a..6fd0e721be 100644 --- a/locale/C-collate.c +++ b/locale/C-collate.c @@ -148,7 +148,7 @@ const struct locale_data _nl_C_LC_COLLATE = _nl_C_name, NULL, 0, 0, /* no file mapped */ UNDELETABLE, - 21, + 30, { { word: 0 }, { string: NULL }, @@ -175,22 +175,10 @@ const struct locale_data _nl_C_LC_COLLATE = { string: NULL }, { string: NULL }, { word: 223 }, -#if __BYTE_ORDER == __LITTLE_ENDIAN - { string: NULL }, -#endif { string: (const char *) _nl_C_LC_COLLATE_symbol_hash }, -#if __BYTE_ORDER == __BIG_ENDIAN - { string: NULL }, -#endif { string: _nl_C_LC_COLLATE_symbol_strings }, { string: NULL }, { string: NULL }, -#if __BYTE_ORDER == __LITTLE_ENDIAN - { string: NULL }, -#endif - { string: (const char *) _nl_C_LC_COLLATE_symbol_classes }, -#if __BYTE_ORDER == __BIG_ENDIAN - { string: NULL }, -#endif + { string: (const char *) _nl_C_LC_COLLATE_symbol_classes } } }; -- cgit v1.2.3