X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fregex.h;fp=lib%2Fregex.h;h=6885ebdf26d6884096e33b3ac4ac6ac16e2aa133;hb=ec5206cfb318f9ac36f2306fb91e4cb2a23f831e;hp=621bffb516aafb153cd0811403f4d24bd88470a4;hpb=4ff20287f2cbf0d1795aa1ef29d874fff1d11d27;p=gnulib.git

diff --git a/lib/regex.h b/lib/regex.h
index 621bffb51..6885ebdf2 100644
--- 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.  */