Mercurial > gnulib
changeset 18329:1a0c8808d4c7
regex: port to Sun C
Reported by Daiki Ueno.
* lib/regcomp.c (regcomp, regerror): Use _Restrict_, not
__restrict, in prototype. This fixes a problem I introduced in
the 2016-02-19 merge from glibc.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Wed, 08 Jun 2016 01:46:35 -0700 |
| parents | 8ac8462b0c27 |
| children | 4b164b50e7e4 |
| files | ChangeLog lib/regcomp.c |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jun 04 05:49:04 2016 -0700 +++ b/ChangeLog Wed Jun 08 01:46:35 2016 -0700 @@ -1,3 +1,11 @@ +2016-06-08 Paul Eggert <eggert@cs.ucla.edu> + + regex: port to Sun C + Reported by Daiki Ueno. + * lib/regcomp.c (regcomp, regerror): Use _Restrict_, not + __restrict, in prototype. This fixes a problem I introduced in + the 2016-02-19 merge from glibc. + 2016-05-31 Paul Eggert <eggert@cs.ucla.edu> stdbool: Restore __bool_true_false_are_defined check
--- a/lib/regcomp.c Sat Jun 04 05:49:04 2016 -0700 +++ b/lib/regcomp.c Wed Jun 08 01:46:35 2016 -0700 @@ -464,7 +464,7 @@ the return codes and their meanings.) */ int -regcomp (regex_t *__restrict preg, const char *__restrict pattern, int cflags) +regcomp (regex_t *_Restrict_ preg, const char *_Restrict_ pattern, int cflags) { reg_errcode_t ret; reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED @@ -523,7 +523,7 @@ from either regcomp or regexec. We don't use PREG here. */ size_t -regerror (int errcode, const regex_t *__restrict preg, char *__restrict errbuf, +regerror (int errcode, const regex_t *_Restrict_ preg, char *_Restrict_ errbuf, size_t errbuf_size) { const char *msg;