* config/srclist.txt: Comment out $LIBCSRC/posix/regex.h.

Add comments for each pending glibc patch.
* lib/regex.h (__restrict_arr): Don't define to __restrict if
__cplusplus is defined.

diff --git a/config/ChangeLog b/config/ChangeLog
index 16ceb4b789b716c9491a289090b7bec5dd788e28..15b6f62ce3621c44f072da72e5274ced3c7e083d 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * srclist.txt: Comment out $LIBCSRC/posix/regex.h.
+       Add comments for each pending glibc patch.
+
 2005-07-08  Paul Eggert  <eggert@cs.ucla.edu>
 
        * srclist.txt: Comment out regcomp.c, since we have a porting fix

diff --git a/config/srclist.txt b/config/srclist.txt
index c1b88676e2df62265773950eba8a436417c7b9dd..7a677afbe7d8c94c608e8f2340d968988db43760 100644 (file)
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.66 2005-07-08 17:57:01 eggert Exp $
+# $Id: srclist.txt,v 1.67 2005-08-16 00:07:03 eggert Exp $
 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 
@@ -93,20 +93,30 @@ $LIBCSRC/stdlib/getsubopt.c         lib gpl
 #$LIBCSRC/posix/getopt.h               lib gpl (getopt_.h in gnulib)
 #$LIBCSRC/posix/getopt1.c              lib gpl
 #$LIBCSRC/posix/getopt_int.h           lib gpl
-# regcomp.c contains a porting fix
+#
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1057
 #$LIBCSRC/posix/regcomp.c              lib gpl
+#
 $LIBCSRC/posix/regex.c                 lib gpl
-$LIBCSRC/posix/regex.h                 lib gpl
+#
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1201
+#$LIBCSRC/posix/regex.h                        lib gpl
+#
 $LIBCSRC/posix/regex_internal.c                lib gpl
-# regex_internal.h contains a porting fix
+#
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1054
 #$LIBCSRC/posix/regex_internal.h               lib gpl
+#
 $LIBCSRC/posix/regexec.c               lib gpl
 # c89 changes $LIBCSRC/string/strdup.c         lib gpl
 $LIBCSRC/sysdeps/generic/strtoll.c     lib gpl
 $LIBCSRC/sysdeps/generic/strtoul.c     lib gpl
 $LIBCSRC/sysdeps/generic/strtok_r.c    lib gpl
 $LIBCSRC/sysdeps/generic/memmem.c      lib gpl
+#
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1033
 #$LIBCSRC/time/mktime.c                        lib gpl
+
 #
 # These are close, but ...
 #$LIBCSRC/crypt/md5.c                  lib gpl
@@ -119,7 +129,10 @@ $LIBCSRC/sysdeps/generic/memmem.c  lib gpl
 #$LIBCSRC/misc/error.h                 lib gpl
 #$LIBCSRC/misc/getpass.c               lib gpl
 #$LIBCSRC/misc/mkstemp.c               lib gpl
+#
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1060
 #$LIBCSRC/posix/glob.h                 lib gpl (glob_.h in gnulib)
+#
 #$LIBCSRC/posix/fnmatch.c              lib gpl
 #$LIBCSRC/posix/fnmatch.h              lib gpl (fnmatch_.h in gnulib)
 #$LIBCSRC/posix/fnmatch_loop.c         lib gpl
@@ -127,7 +140,12 @@ $LIBCSRC/sysdeps/generic/memmem.c  lib gpl
 #$LIBCSRC/stdlib/rpmatch.c             lib gpl
 #$LIBCSRC/string/strndup.c             lib gpl
 #$LIBCSRC/string/strverscmp.c          lib gpl
+#
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1060
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1061
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1062
 #$LIBCSRC/sysdeps/generic/glob.c       lib gpl
+#
 #$LIBCSRC/sysdeps/generic/memchr.c     lib gpl
 #$LIBCSRC/sysdeps/generic/memcmp.c     lib gpl
 #$LIBCSRC/sysdeps/generic/memrchr.c    lib gpl

diff --git a/lib/ChangeLog b/lib/ChangeLog
index a2d3f9e8000e5def8fff6ad7ddbfe80fa3674adf..c3126d394d89405f7a46d1935781a009e9e086a0 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-15  Bruno Haible  <bruno@clisp.org>
+
+       * regex.h (__restrict_arr): Don't define to __restrict if __cplusplus
+       is defined.
+
 2005-08-14  Jim Meyering  <jim@meyering.net>
 
        Sync from coreutils.

diff --git a/lib/regex.h b/lib/regex.h
index 25c950559d654d513da9f1d8bc01c63507ad2bcd..7beaaf06c0f00ab5f9e8185d064fa36a9b345905 100644 (file)
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -552,9 +552,9 @@ extern int re_exec _RE_ARGS ((const char *));
 #  endif
 # endif
 #endif
-/* gcc 3.1 and up support the [restrict] syntax.  */
+/* gcc 3.1 and up support the [restrict] syntax, but g++ doesn't.  */
 #ifndef __restrict_arr
-# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) && !defined __cplusplus
 #  define __restrict_arr __restrict
 # else
 #  define __restrict_arr