* config/srclist.txt: Add glibc bug 1233.

* lib/regex.h (REG_NOSYS)
[!defined _XOPEN_SOURCE && 200112L <= _POSIX_C_SOURCE]:
Define, since POSIX requires it as of 2001.
(_REG_ENOSYS) [! (defined _XOPEN_SOURCE || 200112L <= _POSIX_C_SOURCE)]:
New private symbol, used to keep the enum signed in all cases.

diff --git a/config/ChangeLog b/config/ChangeLog
index 3ffe3ca0d7fa7680e229cda1bbbbde52146d98f4..fe364d592a3a7e04054e7b5e31bfd44af1056d5d 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,6 +1,6 @@
 2005-08-23  Paul Eggert  <eggert@cs.ucla.edu>
 
-       * srclist.txt: Add glibc bugs 1231, 1232.
+       * srclist.txt: Add glibc bugs 1231-1233.
 
 2005-08-20  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/config/srclist.txt b/config/srclist.txt
index 76007a601af7ec08537ec01269af746f3bd9352e..5d64ea8114a11eeea4403f0930df3e5c48482ea0 100644 (file)
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.80 2005-08-23 19:11:46 eggert Exp $
+# $Id: srclist.txt,v 1.81 2005-08-23 20:37:24 eggert Exp $
 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 
@@ -107,6 +107,7 @@ $LIBCSRC/posix/regex.c                      lib gpl
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1207
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1222
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1232
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1233
 #$LIBCSRC/posix/regex.h                        lib gpl
 #
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1215

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 336b1f5808d9c2afa800924fa1137fcd6b0beb6d..b1c6ea8f6f0f60b3963b4fbffe7adc5debe1e4b9 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,10 @@
 2005-08-23  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * regex.h (REG_NOSYS)
+       [!defined _XOPEN_SOURCE && 200112L <= _POSIX_C_SOURCE]:
+       Define, since POSIX requires it as of 2001.
+       (_REG_ENOSYS) [! (defined _XOPEN_SOURCE || 200112L <= _POSIX_C_SOURCE)]:
+       New private symbol, used to keep the enum signed in all cases.
        * regex.h (RE_NO_EMPTY_RANGES): Fix doc bug reported by James Youngman
        in <http://lists.gnu.org/archive/html/bug-gnulib/2005-07/msg00132.html>.
 

diff --git a/lib/regex.h b/lib/regex.h
index c31095aa2fc83c27074f01067457adfb256de87f..188577936120232bf8f4a158ac844aff236ed56e 100644 (file)
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -309,8 +309,10 @@ extern reg_syntax_t re_syntax_options;
    `re_error_msg' table in regex.c.  */
 typedef enum
 {
-#ifdef _XOPEN_SOURCE
+#if defined _XOPEN_SOURCE || 200112L <= _POSIX_C_SOURCE
   REG_ENOSYS = -1,     /* This will never happen for this implementation.  */
+#else
+  _REG_ENOSYS = -1,    /* This is so that reg_errcode_t is always signed.  */
 #endif
 
   REG_NOERROR = 0,     /* Success.  */