Merge changes from Coreutils.

[gnulib.git] / regex.h

diff --git a/regex.h b/regex.h
index b3f72e9..1cfd436 100644 (file)
--- a/regex.h
+++ b/regex.h
@@ -1,7 +1,3 @@
-/* Only edit this file through the CVS module in subversions.  This file
-   is automatically updated whenever changes are made to it there, and
-   all of your work will be lost! - jbailey Sep 19, 2000 */
-
 /* Definitions for data structures and routines for the regular
    expression library, version 0.12.
 
@@ -539,10 +535,12 @@ extern int re_exec _RE_ARGS ((const char *));
 #  endif
 # endif
 #endif
-/* For now unconditionally define __restrict_arr to expand to nothing.
+/* For now conditionally define __restrict_arr to expand to nothing.
    Ideally we would have a test for the compiler which allows defining
    it to restrict.  */
-#define __restrict_arr
+#ifndef __restrict_arr
+# define __restrict_arr
+#endif
 
 /* POSIX compatibility.  */
 extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,