Mercurial > hg > octave-nkf > gnulib-hg
changeset 7692:85409a7d11bc
* 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 | 33b654c2cba8 |
children | 52002c9e5fd9 |
files | ChangeLog lib/regex.h |
diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/lib/regex.h +++ b/lib/regex.h @@ -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. */