* lib/regex.h (__restrict_arr): Redo logic of #if, for clarity.

diff --git a/ChangeLog b/ChangeLog
index 9d1ef5a912014c56d2f21920bed723ae2029094b..0cb621661aa9a1b06b9a0532525fc1b8f411714b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-27  Bruno Haible  <bruno@clisp.org>
+           Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/regex.h (__restrict_arr): Redo logic of #if, for clarity.
+
 2006-11-26  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (func_emit_lib_Makefile_am): Initialize also

diff --git a/lib/regex.h b/lib/regex.h
index 621bffb516aafb153cd0811403f4d24bd88470a4..6885ebdf26d6884096e33b3ac4ac6ac16e2aa133 100644 (file)
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -639,13 +639,13 @@ extern int re_exec (const char *);
    sys/cdefs.h's definition of __restrict_arr, though, as it
    mishandles gcc -ansi -pedantic.  */
 #undef __restrict_arr
-#if (defined __GNUG__                          \
-     || (__STDC_VERSION__ < 199901L            \
-        && (__STRICT_ANSI__                    \
-            || (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 1)))))
-# define __restrict_arr
-#else
+#if ((199901L <= __STDC_VERSION__                                      \
+      || ((3 < __GNUC__ || (3 == __GNUC__ && 1 <= __GNUC_MINOR__))     \
+         && !__STRICT_ANSI__))                                         \
+     && !defined __GNUG__)
 # define __restrict_arr __restrict
+#else
+# define __restrict_arr
 #endif
 
 /* POSIX compatibility.  */