From: Daiki Ueno <ueno@gnu.org>
Date: Tue, 12 Jul 2016 03:15:25 +0000 (+0900)
Subject: Update after gnulib changed
X-Git-Tag: v0.20~509
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c776465944cfaacc3ead64e332c0c891e71e2a95;p=thirdparty%2Fgettext.git

Update after gnulib changed
---

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 790829115..589edf09c 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -233,7 +233,6 @@ 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
deleted file mode 100644
index a6ef92007..000000000
--- a/gnulib-local/lib/regcomp.c.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-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;