Re: [bug-gnulib] regex problems

[Paul Eggert]

Bruno Haible <address@hidden> writes:

> This patch should work. No version of g++ in the 3.2.*, 3.3.*, 3.4.*,
> 4.0.[01] series supports the [__restrict] syntax.

Thanks.  I installed that patch, along with the corresponding change
to srclist.txt, and some commentary improvements there.  I also filed
a glibc bug report so that it gets put into glibc.  Here's what I
installed.

2005-08-15  Paul Eggert  <address@hidden>

        * config/srclist.txt: Comment out $LIBCSRC/posix/regex.h.
        Add comments for each pending glibc patch.

2005-08-15  Bruno Haible  <address@hidden>

        * lib/regex.h (__restrict_arr): Don't define to __restrict if
        __cplusplus is defined.

Index: config/srclist.txt
===================================================================
RCS file: /cvsroot/gnulib/gnulib/config/srclist.txt,v
retrieving revision 1.66
diff -p -u -r1.66 srclist.txt
--- config/srclist.txt  8 Jul 2005 17:57:01 -0000       1.66
+++ config/srclist.txt  16 Aug 2005 00:04:27 -0000
@@ -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 gp
 #$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 gp
 #$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
Index: lib/regex.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/regex.h,v
retrieving revision 1.25
diff -p -u -r1.25 regex.h
--- lib/regex.h 7 Jul 2005 08:08:39 -0000       1.25
+++ lib/regex.h 16 Aug 2005 00:04:27 -0000
@@ -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