diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-09-13 09:07:36 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-09-13 09:07:36 +0000 |
| commit | 4a33c2f55eab04206e22ab972a77f62486fe5a97 (patch) | |
| tree | 3f4efea20d66878b81d2ba1587e16a3133ef65f7 /locale/lc-collate.c | |
| parent | 3e95f6602b226e0de06aaff686dc47b282d7cc16 (diff) | |
Update.
1999-09-13 Ulrich Drepper <drepper@cygnus.com>
* 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.
Diffstat (limited to 'locale/lc-collate.c')
| -rw-r--r-- | locale/lc-collate.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/locale/lc-collate.c b/locale/lc-collate.c index 2970ec3721..a012672b50 100644 --- a/locale/lc-collate.c +++ b/locale/lc-collate.c @@ -45,27 +45,20 @@ const u_int32_t *__collate_symbol_classeswc = _nl_C_LC_COLLATE_symbol_classes; void _nl_postload_collate (void) { -#if BYTE_ORDER == BIG_ENDIAN -#define bo(x) x##_EB -#elif BYTE_ORDER == LITTLE_ENDIAN -#define bo(x) x##_EL -#else -#error bizarre byte order -#endif #define paste(a,b) paste1(a,b) #define paste1(a,b) a##b #define current(x) \ ((const unsigned int *) _NL_CURRENT (LC_COLLATE, paste(_NL_COLLATE_,x))) - __collate_tablewc = current (bo (TABLEWC)); - __collate_extrawc = current (bo (EXTRAWC)); + __collate_tablewc = current (TABLEWC); + __collate_extrawc = current (EXTRAWC); - __collate_element_hash = current (bo (ELEM_HASH)); + __collate_element_hash = current (ELEM_HASH); __collate_element_strings = (const char *) current (ELEM_STR_POOL); - __collate_element_values = (const uint32_t *) current (bo (ELEM_VAL)); + __collate_element_values = (const uint32_t *) current (ELEM_VAL); - __collate_symbol_hash = current (bo (SYMB_HASH)); + __collate_symbol_hash = current (SYMB_HASH); __collate_symbol_strings = (const char *) current (SYMB_STR_POOL); - __collate_symbol_classeswc = current (bo (SYMB_CLASSWC)); + __collate_symbol_classeswc = current (SYMB_CLASSWC); } |