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/programs/ld-address.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/programs/ld-address.c')
| -rw-r--r-- | locale/programs/ld-address.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c index 49900bd471..6dce62bf8f 100644 --- a/locale/programs/ld-address.c +++ b/locale/programs/ld-address.c @@ -68,7 +68,6 @@ struct locale_address_t const char *country_ab2; const char *country_ab3; uint32_t country_num; - uint32_t country_num_ob; const char *country_car; const char *country_isbn; const char *lang_name; @@ -295,7 +294,6 @@ address_finish (struct localedef_t *locale, struct charmap_t *charmap) %s: numeric country code `%d' not valid"), "LC_ADDRESS", address->country_num); } - address->country_num_ob = bswap_32 (address->country_num); if (address->country_ab2 == NULL) { @@ -373,21 +371,8 @@ address_output (struct localedef_t *locale, struct charmap_t *charmap, iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1; ++cnt; -#if __BYTE_ORDER == __LITTLE_ENDIAN -# define country_num_eb country_num_ob -# define country_num_el country_num -#else -# define country_num_eb country_num -# define country_num_el country_num_ob -#endif - - idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len; - iov[cnt].iov_base = (void *) address->country_num_eb; - iov[cnt].iov_len = sizeof (uint32_t); - ++cnt; - idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len; - iov[cnt].iov_base = (void *) address->country_num_el; + iov[cnt].iov_base = (void *) address->country_num; iov[cnt].iov_len = sizeof (uint32_t); ++cnt; |