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.

1 files changed, 2 insertions, 29 deletions

diff --git a/locale/programs/ld-paper.c b/locale/programs/ld-paper.c
index 642ca41380..e20d789a98 100644
--- a/locale/programs/ld-paper.c
+++ b/locale/programs/ld-paper.c
@@ -21,7 +21,6 @@
 # include <config.h>
 #endif
 
-#include <byteswap.h>
 #include <error.h>
 #include <langinfo.h>
 #include <string.h>
@@ -37,9 +36,7 @@
 struct locale_paper_t
 {
   uint32_t height;
-  uint32_t height_ob;
   uint32_t width;
-  uint32_t width_ob;
 };
 
 
@@ -104,7 +101,6 @@ paper_finish (struct localedef_t *locale, struct charmap_t *charmap)
       /* Use as default values the values from the i18n locale.  */
       paper->height = 297;
     }
-  paper->height_ob = bswap_32 (paper->height);
 
   if (paper->width == 0)
     {
@@ -113,7 +109,6 @@ paper_finish (struct localedef_t *locale, struct charmap_t *charmap)
       /* Use as default values the values from the i18n locale.  */
       paper->width = 210;
     }
-  paper->width_ob = bswap_32 (paper->width);
 }
 
 
@@ -133,39 +128,17 @@ paper_output (struct localedef_t *locale, struct charmap_t *charmap,
   iov[cnt].iov_len = sizeof (data);
   ++cnt;
 
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-# define height_eb	height_ob
-# define height_el	height
-# define width_eb	width_ob
-# define width_el	width
-#else
-# define height_eb	height
-# define height_el	height_ob
-# define width_eb	width
-# define width_el	width_ob
-#endif
-
   iov[cnt].iov_base = (void *) idx;
   iov[cnt].iov_len = sizeof (idx);
   ++cnt;
 
   idx[cnt - 2] = iov[0].iov_len + iov[1].iov_len;
-  iov[cnt].iov_base = &paper->height_eb;
-  iov[cnt].iov_len = 4;
-  ++cnt;
-
-  idx[cnt - 2] = iov[0].iov_len + iov[1].iov_len;
-  iov[cnt].iov_base = &paper->height_el;
-  iov[cnt].iov_len = 4;
-  ++cnt;
-
-  idx[cnt - 2] = iov[0].iov_len + iov[1].iov_len;
-  iov[cnt].iov_base = &paper->width_eb;
+  iov[cnt].iov_base = &paper->height;
   iov[cnt].iov_len = 4;
   ++cnt;
 
   idx[cnt - 2] = iov[0].iov_len + iov[1].iov_len;
-  iov[cnt].iov_base = &paper->width_el;
+  iov[cnt].iov_base = &paper->width;
   iov[cnt].iov_len = 4;
   ++cnt;