From 52bc074fec2a0e606b69f6d94198a6cbcb044442 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 31 Aug 1999 18:42:14 +0000
Subject: Update.

1999-08-31  Andreas Schwab  <schwab@suse.de>

	* locale/C-collate.c: Add missing initialisations.
	* locale/C-ctype.c: Likewise.
---
 ChangeLog                |  5 +++++
 locale/C-collate.c       | 15 +++++++++++++--
 locale/C-ctype.c         | 22 ++++++++++++++++++++--
 localedata/ChangeLog     |  3 +++
 localedata/locales/en_DK |  3 ++-
 5 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 91ac996..5c750ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-31  Andreas Schwab  <schwab@suse.de>
+
+	* locale/C-collate.c: Add missing initialisations.
+	* locale/C-ctype.c: Likewise.
+
 1999-08-31  Ulrich Drepper  <drepper@cygnus.com>
 
 	* time/strftime.c (my_strftime): Remove unneeded variable len.
diff --git a/locale/C-collate.c b/locale/C-collate.c
index ba85002..616fed1 100644
--- a/locale/C-collate.c
+++ b/locale/C-collate.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -156,15 +156,24 @@ const struct locale_data _nl_C_LC_COLLATE =
     { word: 0 },
     { string: NULL },
     { string: NULL },
+    { string: NULL },
+    { string: NULL },
+    { word: 0 },
     { word: 0 },
     { string: NULL },
     { string: NULL },
+    { string: NULL },
+    { string: NULL },
     { word: 0 },
     { string: NULL },
     { string: NULL },
     { string: NULL },
     { string: NULL },
     { string: NULL },
+    { string: NULL },
+    { string: NULL },
+    { string: NULL },
+    { string: NULL },
     { word: 223 },
 #if __BYTE_ORDER == __LITTLE_ENDIAN
     { string: NULL },
@@ -174,6 +183,8 @@ const struct locale_data _nl_C_LC_COLLATE =
     { string: NULL },
 #endif
     { string: _nl_C_LC_COLLATE_symbol_strings },
+    { string: NULL },
+    { string: NULL },
 #if __BYTE_ORDER == __LITTLE_ENDIAN
     { string: NULL },
 #endif
diff --git a/locale/C-ctype.c b/locale/C-ctype.c
index 77281b0..f81f5c3 100644
--- a/locale/C-ctype.c
+++ b/locale/C-ctype.c
@@ -361,8 +361,11 @@ const struct locale_data _nl_C_LC_CTYPE =
     { string: (const char *) _nl_C_LC_CTYPE_names },
 #if BYTE_ORDER == BIG_ENDIAN
     { string: NULL },
-#endif
     { word: 256 }, { word: 1 },
+#endif
+#if BYTE_ORDER == LITTLE_ENDIAN
+    { word: 0 }, { word: 0 },
+#endif
     { 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"
@@ -375,7 +378,14 @@ const struct locale_data _nl_C_LC_CTYPE =
     { string: _nl_C_LC_CTYPE_width },
     { word: 1 },
     { string: "ANSI_X3.4-1968" },
-    { word: 1 },
+#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
     { string: "0" },
     { string: "1" },
     { string: "2" },
@@ -386,6 +396,12 @@ 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"" },
@@ -473,6 +489,8 @@ const struct locale_data _nl_C_LC_CTYPE =
     { string: "" },
     { string: "" },
     { string: "" },
+    { string: "" },
+    { string: "" },
     { string: "" }
   }
 };
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index ba93c4e..cb43a5e 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,8 @@
 1999-08-31  Ulrich Drepper  <drepper@cygnus.com>
 
+	* locales/en_DK: Add Euro symbol to collation and characterization
+	tables.  Patch by Geoff Keating.
+
 	* charmaps/ISO-8859-15: Remove duplicate <OC>.
 
 1999-08-16  Ulrich Drepper  <drepper@cygnus.com>
diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK
index a8fb80a..0cc9b04 100644
--- a/localedata/locales/en_DK
+++ b/localedata/locales/en_DK
@@ -313,6 +313,7 @@ order_start forward;forward/
 <Rg>	IGNORE;IGNORE;IGNORE;<Rg>
 <At>	IGNORE;IGNORE;IGNORE;<At>
 <Cu>	IGNORE;IGNORE;IGNORE;<Cu>
+<Eu>	IGNORE;IGNORE;IGNORE;<Eu>
 <Ct>	IGNORE;IGNORE;IGNORE;<Ct>
 <DO>	IGNORE;IGNORE;IGNORE;<DO>
 <Pd>	IGNORE;IGNORE;IGNORE;<Pd>
@@ -2538,7 +2539,7 @@ punct   <!>;<">;<Nb>;<DO>;<%>;<&>;<'>;/
         <//>;<:>;<;>;<<>;<=>;</>>;<?>;/
         <At>;<<(>;<////>;<)/>>;<'/>>;/
         <_>;<'!>;<(!>;<!!>;<!)>;<'?>;/
-        <!I>;<Ct>;<Pd>;<Cu>;<Ye>;<BB>;/
+        <!I>;<Ct>;<Pd>;<Cu>;<Eu>;<Ye>;<BB>;/
         <SE>;<':>;<Co>;<-a>;<<<>;<NO>;/
         <Rg>;<'m>;<DG>;<+->;<2S>;<3S>;/
         <''>;<My>;<PI>;<.M>;<',>;<1S>;/
-- 
cgit v1.1