diff options
| author | Pedro J. Ruiz Lopez <holzplatten@es.gnu.org> | 2007-02-12 23:24:21 +0000 |
|---|---|---|
| committer | Pedro J. Ruiz Lopez <holzplatten@es.gnu.org> | 2007-02-12 23:24:21 +0000 |
| commit | 80f3bd30c7521091c1dea118603b20a76c2a180c (patch) | |
| tree | 359d11fb051a720d6958341ab5ac1fbff2fe5fd2 /lib/regexec.c | |
| parent | 56a64cd30f232800884506d88acd780c431be1a5 (diff) | |
| download | idutils-80f3bd30c7521091c1dea118603b20a76c2a180c.tar.gz idutils-80f3bd30c7521091c1dea118603b20a76c2a180c.tar.bz2 idutils-80f3bd30c7521091c1dea118603b20a76c2a180c.zip | |
* upgraded gnulib
Diffstat (limited to 'lib/regexec.c')
| -rw-r--r-- | lib/regexec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/regexec.c b/lib/regexec.c index 84c3aed..cba5ea2 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -221,10 +221,10 @@ static reg_errcode_t extend_buffers (re_match_context_t *mctx) int regexec (preg, string, nmatch, pmatch, eflags) - const regex_t *__restrict preg; - const char *__restrict string; + const regex_t *_Restrict_ preg; + const char *_Restrict_ string; size_t nmatch; - regmatch_t pmatch[]; + regmatch_t pmatch[_Restrict_arr_]; int eflags; { reg_errcode_t err; @@ -267,8 +267,8 @@ __typeof__ (__regexec) __compat_regexec; int attribute_compat_text_section -__compat_regexec (const regex_t *__restrict preg, - const char *__restrict string, size_t nmatch, +__compat_regexec (const regex_t *_Restrict_ preg, + const char *_Restrict_ string, size_t nmatch, regmatch_t pmatch[], int eflags) { return regexec (preg, string, nmatch, pmatch, @@ -3966,7 +3966,7 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx, # endif /* _LIBC */ { /* match with range expression? */ -#if __GNUC__ >= 2 +#if __GNUC__ >= 2 && ! (__STDC_VERSION__ < 199901L && __STRICT_ANSI__) wchar_t cmp_buf[] = {L'\0', L'\0', wc, L'\0', L'\0', L'\0'}; #else wchar_t cmp_buf[] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'}; |