1diff -upr -x .deps -x .libs -x '*.la' regex-20090805.old/lib/gettext.h regex-20090805/lib/gettext.h 2--- regex-20090805.old/lib/gettext.h 2009-08-05 19:37:29 +0000 3+++ regex-20090805/lib/gettext.h 2014-05-31 06:05:12 +0000 4@@ -178,7 +178,7 @@ npgettext_aux (const char *domain, 5 #include <string.h> 6 7 #define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \ 8- (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \ 9+ (((__GNUC__ >= 3 || __GNUG__ >= 2) && (defined(__STRICT_ANSI__) && !__STRICT_ANSI__)) \ 10 /* || __STDC_VERSION__ >= 199901L */ ) 11 12 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 13diff -upr -x .deps -x .libs -x '*.la' regex-20090805.old/lib/regex.h regex-20090805/lib/regex.h 14--- regex-20090805.old/lib/regex.h 2009-08-05 19:37:32 +0000 15+++ regex-20090805/lib/regex.h 2014-05-31 06:05:29 +0000 16@@ -630,7 +630,7 @@ extern int re_exec (const char *); 17 'configure' might #define 'restrict' to those words, so pick a 18 different name. */ 19 #ifndef _Restrict_ 20-# if 199901L <= __STDC_VERSION__ 21+# if (defined(__STDC_VERSION__) && 199901L <= __STDC_VERSION__) 22 # define _Restrict_ restrict 23 # elif 2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__) 24 # define _Restrict_ __restrict 25@@ -642,9 +642,9 @@ extern int re_exec (const char *); 26 sys/cdefs.h's definition of __restrict_arr, though, as it 27 mishandles gcc -ansi -pedantic. */ 28 #ifndef _Restrict_arr_ 29-# if ((199901L <= __STDC_VERSION__ \ 30+# if (((defined(__STDC_VERSION__) && 199901L <= __STDC_VERSION__) \ 31 || ((3 < __GNUC__ || (3 == __GNUC__ && 1 <= __GNUC_MINOR__)) \ 32- && !__STRICT_ANSI__)) \ 33+ && (!defined(__STRICT_ANSI__) || !__STRICT_ANSI__))) \ 34 && !defined __GNUG__) 35 # define _Restrict_arr_ _Restrict_ 36 # else 37diff -upr -x .deps -x .libs -x '*.la' regex-20090805.old/lib/regex_internal.h regex-20090805/lib/regex_internal.h 38--- regex-20090805.old/lib/regex_internal.h 2009-08-05 19:37:33 +0000 39+++ regex-20090805/lib/regex_internal.h 2014-05-31 06:05:50 +0000 40@@ -338,7 +338,7 @@ typedef struct 41 Idx idx; /* for BACK_REF */ 42 re_context_type ctx_type; /* for ANCHOR */ 43 } opr; 44-#if __GNUC__ >= 2 && !__STRICT_ANSI__ 45+#if __GNUC__ >= 2 && (defined(__STRICT_ANSI__) && !__STRICT_ANSI__) 46 re_token_type_t type : 8; 47 #else 48 re_token_type_t type; 49