Mercurial > gnulib

changeset 27383:ef39472d1b49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* lib/regex.h (__restrict_arr): Redo logic of #if, for clarity.
author Paul Eggert <eggert@cs.ucla.edu>
date Mon, 27 Nov 2006 19:41:42 +0000
parents 7558f2104b49
children fd8cf1d39f33
files ChangeLog lib/regex.h
diffstat 2 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Nov 27 14:22:11 2006 +0000
+++ b/ChangeLog	Mon Nov 27 19:41:42 2006 +0000
@@ -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
--- a/lib/regex.h	Mon Nov 27 14:22:11 2006 +0000
+++ b/lib/regex.h	Mon Nov 27 19:41:42 2006 +0000
@@ -639,13 +639,13 @@
    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)))))
+#if ((199901L <= __STDC_VERSION__					\
+      || ((3 < __GNUC__ || (3 == __GNUC__ && 1 <= __GNUC_MINOR__))	\
+	  && !__STRICT_ANSI__))						\
+     && !defined __GNUG__)
+# define __restrict_arr __restrict
+#else
 # define __restrict_arr
-#else
-# define __restrict_arr __restrict
 #endif
 
 /* POSIX compatibility.  */