diff options
| author | Karl Berry <karl@freefriends.org> | 2020-08-12 10:12:13 -0700 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2020-08-12 10:12:13 -0700 |
| commit | 69931285d521536a61eb87bd1a75e8d6f4d2fa05 (patch) | |
| tree | 2ee3b0ef5c74daa2a4453c8bd2ba093c572b6e4e /lib/regex.h | |
| parent | bfd0179474b338eff846b409e3775362fc374451 (diff) | |
| download | gnulib-69931285d521536a61eb87bd1a75e8d6f4d2fa05.tar.gz | |
autoupdate
Diffstat (limited to 'lib/regex.h')
| -rw-r--r-- | lib/regex.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lib/regex.h b/lib/regex.h index 7418e6c76f..5fe41c8685 100644 --- a/lib/regex.h +++ b/lib/regex.h @@ -612,9 +612,7 @@ extern int re_exec (const char *); 'configure' might #define 'restrict' to those words, so pick a different name. */ #ifndef _Restrict_ -# if defined __restrict \ - || 2 < __GNUC__ + (95 <= __GNUC_MINOR__) \ - || __clang_major__ >= 3 +# if defined __restrict || 2 < __GNUC__ + (95 <= __GNUC_MINOR__) # define _Restrict_ __restrict # elif 199901L <= __STDC_VERSION__ || defined restrict # define _Restrict_ restrict @@ -622,18 +620,13 @@ extern int re_exec (const char *); # define _Restrict_ # endif #endif -/* For the ISO C99 syntax - array_name[restrict] - use glibc's __restrict_arr if available. - Otherwise, GCC 3.1 and clang support this syntax (but not in C++ mode). - Other ISO C99 compilers support it as well. */ +/* For [restrict], use glibc's __restrict_arr if available. + Otherwise, GCC 3.1 (not in C++ mode) and C99 support [restrict]. */ #ifndef _Restrict_arr_ # ifdef __restrict_arr # define _Restrict_arr_ __restrict_arr -# elif ((199901L <= __STDC_VERSION__ \ - || 3 < __GNUC__ + (1 <= __GNUC_MINOR__) \ - || __clang_major__ >= 3) \ - && !defined __cplusplus) +# elif ((199901L <= __STDC_VERSION__ || 3 < __GNUC__ + (1 <= __GNUC_MINOR__)) \ + && !defined __GNUG__) # define _Restrict_arr_ _Restrict_ # else # define _Restrict_arr_ |