regex.h import from gnulib

[Paul Eggert]

I'm trying to get all the regex patches standardized, and the first
step is to import gnulib changes into coreutils.  I installed this:

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

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

Index: regex.h
===================================================================
RCS file: /fetish/cu/lib/regex.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -p -u -r1.22 -r1.23
--- regex.h     12 Aug 2005 12:41:41 -0000      1.22
+++ regex.h     19 Aug 2005 21:14:12 -0000      1.23
@@ -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