gnulib-local: Work around regcomp.c compile error

* gnulib-local/Makefile.am (EXTRA_DIST): Add lib/regcomp.c.diff.
* gnulib-local/lib/regcomp.c.diff: New file, partially revert Gnulib
commit f97745b0.
This commit is contained in:
Daiki Ueno
2016-06-08 17:15:26 +09:00
parent 59d9b55bb2
commit a89aa6f41c
2 changed files with 23 additions and 0 deletions
+1
View File
@@ -223,6 +223,7 @@ lib/obstack.h.diff \
lib/ostream.oo.c \
lib/ostream.oo.h \
lib/progname.h.diff \
lib/regcomp.c.diff \
lib/regexec.c.diff \
lib/regex_internal.h.diff \
lib/spawn-pipe.c.diff \
+22
View File
@@ -0,0 +1,22 @@
diff --git a/regcomp.c b/regcomp.c
index 6de9b72..1f24938 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -464,7 +464,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
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 @@ weak_alias (__regcomp, regcomp)
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;