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.

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index da460616a470d6d40ad9e5f80930919013ba4916..37c801c7f63b9f49f57483f3e1f287851432897b 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -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 \

diff --git a/gnulib-local/lib/regcomp.c.diff b/gnulib-local/lib/regcomp.c.diff
new file mode 100644 (file)
index 0000000..a6ef920
--- /dev/null
+++ b/gnulib-local/lib/regcomp.c.diff
@@ -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;