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-time.c | |
| parent | 3e95f6602b226e0de06aaff686dc47b282d7cc16 (diff) | |
| download | glibc-4a33c2f55eab04206e22ab972a77f62486fe5a97.zip glibc-4a33c2f55eab04206e22ab972a77f62486fe5a97.tar.gz glibc-4a33c2f55eab04206e22ab972a77f62486fe5a97.tar.bz2 | |
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-time.c')
| -rw-r--r-- | locale/lc-time.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/locale/lc-time.c b/locale/lc-time.c index 77888bb..533e2e0 100644 --- a/locale/lc-time.c +++ b/locale/lc-time.c @@ -64,13 +64,8 @@ _nl_get_era_entry (const struct tm *tp) if (era_initialized == 0) { -#if __BYTE_ORDER == __LITTLE_ENDIAN size_t new_num_eras = _NL_CURRENT_WORD (LC_TIME, - _NL_TIME_ERA_NUM_ENTRIES_EL); -#else - size_t new_num_eras = _NL_CURRENT_WORD (LC_TIME, - _NL_TIME_ERA_NUM_ENTRIES_EB); -#endif + _NL_TIME_ERA_NUM_ENTRIES); if (eras != NULL && new_num_eras == 0) { @@ -86,11 +81,7 @@ _nl_get_era_entry (const struct tm *tp) num_eras = 0; else { -#if __BYTE_ORDER == __LITTLE_ENDIAN - const char *ptr = _NL_CURRENT (LC_TIME, _NL_TIME_ERA_ENTRIES_EL); -#else - const char *ptr = _NL_CURRENT (LC_TIME, _NL_TIME_ERA_ENTRIES_EB); -#endif + const char *ptr = _NL_CURRENT (LC_TIME, _NL_TIME_ERA_ENTRIES); num_eras = new_num_eras; for (cnt = 0; cnt < num_eras; ++cnt) @@ -193,11 +184,7 @@ _nl_get_walt_digit (unsigned int number) if (walt_digits != NULL) { -#if __BYTE_ORDER == __LITTLE_ENDIAN - const wchar_t *ptr = _NL_CURRENT_WSTR (LC_TIME, _NL_WALT_DIGITS_EL); -#else - const wchar_t *ptr = _NL_CURRENT_WSTR (LC_TIME, _NL_WALT_DIGITS_EB); -#endif + const wchar_t *ptr = _NL_CURRENT_WSTR (LC_TIME, _NL_WALT_DIGITS); size_t cnt; for (cnt = 0; cnt < 100; ++cnt) |