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/newlocale.c | |
parent | 3e95f6602b226e0de06aaff686dc47b282d7cc16 (diff) | |
download | glibc-4a33c2f55eab04206e22ab972a77f62486fe5a97.tar.gz glibc-4a33c2f55eab04206e22ab972a77f62486fe5a97.tar.xz 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 'locale/newlocale.c')
-rw-r--r-- | locale/newlocale.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/locale/newlocale.c b/locale/newlocale.c index 61a72c4aeb..4a2f14513f 100644 --- a/locale/newlocale.c +++ b/locale/newlocale.c @@ -177,19 +177,10 @@ __newlocale (int category_mask, const char *locale, __locale_t base) union locale_data_value *ctypes = result_ptr->__locales[LC_CTYPE]->values; result_ptr->__ctype_b = (const unsigned short int *) (ctypes[_NL_ITEM_INDEX (_NL_CTYPE_CLASS)] .string); -#if BYTE_ORDER == BIG_ENDIAN result_ptr->__ctype_tolower = (const int *) - (ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOLOWER_EB)].string); + (ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOLOWER)].string); result_ptr->__ctype_toupper = (const int *) - (ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOUPPER_EB)].string); -#elif BYTE_ORDER == LITTLE_ENDIAN - result_ptr->__ctype_tolower = (const int *) - (ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOLOWER_EL)].string); - result_ptr->__ctype_toupper = (const int *) - (ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOUPPER_EL)].string); -#else -#error bizarre byte order -#endif + (ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOUPPER)].string); } return result_ptr; |