aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--localedata/ChangeLog4
-rw-r--r--localedata/locales/de_DE6
-rw-r--r--posix/regex.h3
4 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c370154d9f..35396998ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2006-05-02 Ulrich Drepper <drepper@redhat.com>
+ [BZ #1201]
+ * posix/regex.h: g++ still cannot handled [restrict].
+
[BZ #2509]
* stdio-common/vfprintf.c (process_arg): Fix reading of signed
short and byte values from parameter list.
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 70b9e2e8fb..8fb2d58464 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,9 @@
2006-05-02 Ulrich Drepper <drepper@redhat.com>
+ [BZ #1203]
+ * locales/de_DE: Fix order of day of month and month name in
+ date_fmt. Add period after the day number and avoid padding.
+
* SUPPORTED (SUPPORTED-LOCALES): Add tr_CY.ISO-8859-9 and
tr_CY.UTF-8.
diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE
index 51a88d5622..8c6fe41eb2 100644
--- a/localedata/locales/de_DE
+++ b/localedata/locales/de_DE
@@ -150,9 +150,9 @@ d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>"
% "%T"
t_fmt "<U0025><U0054>"
t_fmt_ampm ""
-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+date_fmt "<U0025><U0061><U0020><U0025><U002D><U0064><U002E><U0020>/
+<U0025><U0062><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>/
+<U0020><U0025><U005A><U0020><U0025><U0059>"
END LC_TIME
LC_MESSAGES
diff --git a/posix/regex.h b/posix/regex.h
index d787b9bff9..807c404ec2 100644
--- a/posix/regex.h
+++ b/posix/regex.h
@@ -525,7 +525,8 @@ extern int re_exec (const char *);
#endif
/* gcc 3.1 and up support the [restrict] syntax. */
#ifndef __restrict_arr
-# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) \
+ && !defined __GNUG__
# define __restrict_arr __restrict
# else
# define __restrict_arr