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, 5 insertions, 85 deletions

diff --git a/locale/C-ctype.c b/locale/C-ctype.c
index f81f5c3ac1..1a1ab5b796 100644
--- a/locale/C-ctype.c
+++ b/locale/C-ctype.c
@@ -343,29 +343,15 @@ const struct locale_data _nl_C_LC_CTYPE =
   _nl_C_name,
   NULL, 0, 0, /* no file mapped */
   UNDELETABLE,
-  15,
+  60,
   {
     { string: _nl_C_LC_CTYPE_class },
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { string: NULL }, { string: NULL },
-#endif
     { string: (const char *) _nl_C_LC_CTYPE_toupper },
     { string: (const char *) _nl_C_LC_CTYPE_tolower },
-#if BYTE_ORDER == BIG_ENDIAN
-    { string: NULL }, { string: NULL },
-#endif
     { string: _nl_C_LC_CTYPE_class32 },
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { string: NULL },
-#endif
     { string: (const char *) _nl_C_LC_CTYPE_names },
-#if BYTE_ORDER == BIG_ENDIAN
-    { string: NULL },
-    { word: 256 }, { word: 1 },
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { word: 0 }, { word: 0 },
-#endif
+    { word: 256 },
+    { word: 1 },
     { string: "upper\0" "lower\0" "alpha\0" "digit\0" "xdigit\0" "space\0"
 	      "print\0" "graph\0" "blank\0" "cntrl\0" "punct\0"  "alnum\0"
 	      "left_to_right\0" "right_to_left\0" "num_terminator\0"
@@ -378,14 +364,7 @@ const struct locale_data _nl_C_LC_CTYPE =
     { string: _nl_C_LC_CTYPE_width },
     { word: 1 },
     { string: "ANSI_X3.4-1968" },
-#if BYTE_ORDER == BIG_ENDIAN
-    { word: 0 }, { word: 0 },
-    { word: 1 }, { word: 0 },
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { word: 256 }, { word: 1 },
-    { word: 0 }, { word: 1 },
-#endif
+    { word: 1 },
     { string: "0" },
     { string: "1" },
     { string: "2" },
@@ -396,24 +375,7 @@ const struct locale_data _nl_C_LC_CTYPE =
     { string: "7" },
     { string: "8" },
     { string: "9" },
-#if BYTE_ORDER == BIG_ENDIAN
-    { word: 1 }, { word: 0 },
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { word: 0 }, { word: 1 },
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-#endif
+    { word: 1 },
     { wstr: (uint32_t *) L"0" },
     { wstr: (uint32_t *) L"1" },
     { wstr: (uint32_t *) L"2" },
@@ -424,18 +386,6 @@ const struct locale_data _nl_C_LC_CTYPE =
     { wstr: (uint32_t *) L"7" },
     { wstr: (uint32_t *) L"8" },
     { wstr: (uint32_t *) L"9" },
-#if BYTE_ORDER == BIG_ENDIAN
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-#endif
     { string: "0" },
     { string: "1" },
     { string: "2" },
@@ -446,18 +396,6 @@ const struct locale_data _nl_C_LC_CTYPE =
     { string: "7" },
     { string: "8" },
     { string: "9" },
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-#endif
     { word: L'0' },
     { word: L'1' },
     { word: L'2' },
@@ -468,29 +406,11 @@ const struct locale_data _nl_C_LC_CTYPE =
     { word: L'7' },
     { word: L'8' },
     { word: L'9' },
-#if BYTE_ORDER == BIG_ENDIAN
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-#endif
-    { word: 0 },
-    { word: 0 },
     { word: 0 },
     { word: 0 },
     { string: "" },
     { string: "" },
     { string: "" },
-    { string: "" },
-    { string: "" },
-    { string: "" },
-    { string: "" },
     { string: "" }
   }
 };