diff options
author | DJ Delorie <dj@redhat.com> | 2002-04-17 01:03:04 +0000 |
---|---|---|
committer | DJ Delorie <dj@redhat.com> | 2002-04-17 01:03:04 +0000 |
commit | 7eb54398405018ce7bef789bafa2b3ae0c6a5cdf (patch) | |
tree | b3145a22c9166991fc8585862fa663a1284843d4 /include/xregex2.h | |
parent | dad32754b99f5950c815fa86ad8c149c7a0ca2d0 (diff) | |
download | cygnal-7eb54398405018ce7bef789bafa2b3ae0c6a5cdf.tar.gz cygnal-7eb54398405018ce7bef789bafa2b3ae0c6a5cdf.tar.bz2 cygnal-7eb54398405018ce7bef789bafa2b3ae0c6a5cdf.zip |
merge from gcc
Diffstat (limited to 'include/xregex2.h')
-rw-r--r-- | include/xregex2.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/include/xregex2.h b/include/xregex2.h index b9c2d97cc..2991daf9b 100644 --- a/include/xregex2.h +++ b/include/xregex2.h @@ -529,10 +529,16 @@ extern int re_exec _RE_ARGS ((const char *)); # endif # endif #endif -/* For now unconditionally define __restrict_arr to expand to nothing. - Ideally we would have a test for the compiler which allows defining - it to restrict. */ -#define __restrict_arr + +/* GCC 3.1 and later support declaring arrays as non-overlapping + using the syntax array_name[restrict] */ +#ifndef __restrict_arr +# if ! (3 < __GNUC__ || (3 == __GNUC__ && 1 <= __GNUC_MINOR__)) || defined (__GNUG__) +# define __restrict_arr +# else +# define __restrict_arr __restrict +# endif +#endif /* POSIX compatibility. */ extern int regcomp _RE_ARGS ((regex_t *__restrict __preg, |