aboutsummaryrefslogtreecommitdiff
path: root/wctype
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-09-13 09:07:36 +0000
committerUlrich Drepper <drepper@redhat.com>1999-09-13 09:07:36 +0000
commit4a33c2f55eab04206e22ab972a77f62486fe5a97 (patch)
tree3f4efea20d66878b81d2ba1587e16a3133ef65f7 /wctype
parent3e95f6602b226e0de06aaff686dc47b282d7cc16 (diff)
downloadglibc-4a33c2f55eab04206e22ab972a77f62486fe5a97.tar
glibc-4a33c2f55eab04206e22ab972a77f62486fe5a97.tar.gz
glibc-4a33c2f55eab04206e22ab972a77f62486fe5a97.tar.bz2
glibc-4a33c2f55eab04206e22ab972a77f62486fe5a97.zip
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 'wctype')
-rw-r--r--wctype/cname-lookup.h28
1 files changed, 5 insertions, 23 deletions
diff --git a/wctype/cname-lookup.h b/wctype/cname-lookup.h
index ffe677b7cf..62111b60d1 100644
--- a/wctype/cname-lookup.h
+++ b/wctype/cname-lookup.h
@@ -37,35 +37,17 @@ cname_lookup (wint_t wc, __locale_t locale)
#ifndef USE_IN_EXTENDED_LOCALE_MODEL
extern unsigned int *__ctype_names;
-# if BYTE_ORDER == BIG_ENDIAN
- hash_size = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_HASH_SIZE_EB);
- hash_layers = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_HASH_LAYERS_EB);
-# elif BYTE_ORDER == LITTLE_ENDIAN
- hash_size = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_HASH_SIZE_EL);
- hash_layers = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_HASH_LAYERS_EL);
-# else
-# error bizarre byte order
-# endif
+ hash_size = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_HASH_SIZE);
+ hash_layers = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_HASH_LAYERS);
#else
struct locale_data *current = locale->__locales[LC_CTYPE];
-# if BYTE_ORDER == BIG_ENDIAN
unsigned int *__ctype_names =
- (unsigned int *) current->values[_NL_ITEM_INDEX (_NL_CTYPE_NAMES_EB)].string;
+ (unsigned int *) current->values[_NL_ITEM_INDEX (_NL_CTYPE_NAMES)].string;
hash_size =
- current->values[_NL_ITEM_INDEX (_NL_CTYPE_HASH_SIZE_EB)].word;
+ current->values[_NL_ITEM_INDEX (_NL_CTYPE_HASH_SIZE)].word;
hash_layers =
- current->values[_NL_ITEM_INDEX (_NL_CTYPE_HASH_LAYERS_EB)].word;
-# elif BYTE_ORDER == LITTLE_ENDIAN
- unsigned int *__ctype_names =
- (unsigned int *) current->values[_NL_ITEM_INDEX (_NL_CTYPE_NAMES_EL)].string;
- hash_size =
- current->values[_NL_ITEM_INDEX (_NL_CTYPE_HASH_SIZE_EL)].word;
- hash_layers =
- current->values[_NL_ITEM_INDEX (_NL_CTYPE_HASH_LAYERS_EL)].word;
-# else
-# error bizarre byte order
-# endif
+ current->values[_NL_ITEM_INDEX (_NL_CTYPE_HASH_LAYERS)].word;
#endif
result = wc % hash_size;