From 379362a16d4892f71a1b858971eff22ccf4dd188 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 10 Dec 2016 16:02:21 +0100
Subject: [PATCH] Update to newest gnulib.

---
 gnulib                               | 2 +-
 gnulib-local/lib/diffseq.h.diff      | 2 +-
 gnulib-local/lib/fnmatch_loop.c.diff | 8 ++++----
 gnulib-local/lib/obstack.h.diff      | 8 ++++----
 gnulib-local/modules/fnmatch.diff    | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnulib b/gnulib
index 68b6adebe..83d3c7ff3 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 68b6adebef05670a312fb92b05e7bd089d2ed43a
+Subproject commit 83d3c7ff38488105ab667b37671086c3d739c30c
diff --git a/gnulib-local/lib/diffseq.h.diff b/gnulib-local/lib/diffseq.h.diff
index ef0d4607a..ebd3b1953 100644
--- a/gnulib-local/lib/diffseq.h.diff
+++ b/gnulib-local/lib/diffseq.h.diff
@@ -2,7 +2,7 @@ diff --git a/diffseq.h b/diffseq.h
 index 1974c36..02ef9f2 100644
 --- a/diffseq.h
 +++ b/diffseq.h
-@@ -186,7 +186,7 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim,
+@@ -207,7 +207,7 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim,
    for (c = 1;; ++c)
      {
        OFFSET d;                 /* Active diagonal. */
diff --git a/gnulib-local/lib/fnmatch_loop.c.diff b/gnulib-local/lib/fnmatch_loop.c.diff
index 1683a1433..85c299f3d 100644
--- a/gnulib-local/lib/fnmatch_loop.c.diff
+++ b/gnulib-local/lib/fnmatch_loop.c.diff
@@ -5,7 +5,7 @@
     struct patternlist
     {
       struct patternlist *next;
-      CHAR str[1];
+      CHAR str[FLEXIBLE_ARRAY_MEMBER];
     } *list = NULL;
     struct patternlist **lastp = &list;
     size_t pattern_len = STRLEN (pattern);
@@ -27,7 +27,7 @@
     {
       struct patternlist *next;
 +     int malloced;
-      CHAR str[1];
+      CHAR str[FLEXIBLE_ARRAY_MEMBER];
     } *list = NULL;
     struct patternlist **lastp = &list;
     size_t pattern_len = STRLEN (pattern);
@@ -69,7 +69,7 @@
 ***************
 *** 1075,1085 ****
               plensize = plen * sizeof (CHAR);                                  \
-              newpsize = offsetof (struct patternlist, str) + plensize;         \
+              newpsize = FLEXSIZEOF (struct patternlist, str, plensize);        \
               if ((size_t) -1 / sizeof (CHAR) < plen                            \
 !                 || newpsize < offsetof (struct patternlist, str)              \
 !                 || ALLOCA_LIMIT <= newpsize)                                  \
@@ -81,7 +81,7 @@
               lastp = &newp->next
 --- 1081,1101 ----
               plensize = plen * sizeof (CHAR);                                  \
-              newpsize = offsetof (struct patternlist, str) + plensize;         \
+              newpsize = FLEXSIZEOF (struct patternlist, str, plensize);        \
               if ((size_t) -1 / sizeof (CHAR) < plen                            \
 !                 || newpsize < offsetof (struct patternlist, str))             \
 !               goto failed;                                                    \
diff --git a/gnulib-local/lib/obstack.h.diff b/gnulib-local/lib/obstack.h.diff
index c4d2013f7..d8fe28709 100644
--- a/gnulib-local/lib/obstack.h.diff
+++ b/gnulib-local/lib/obstack.h.diff
@@ -1,22 +1,22 @@
 *** obstack.h.orig	2014-04-07 15:57:16.908837962 +0900
 --- obstack.h	2014-04-07 15:58:22.208411479 +0900
 ***************
-*** 201,210 ****
+*** 221,230 ****
      more memory.  This can be set to a user defined function which
      should either abort gracefully or use longjump - but shouldn't
      return.  The default action is to print a message and abort.  */
-! extern void (*obstack_alloc_failed_handler) (void);
+! extern __attribute_noreturn__ void (*obstack_alloc_failed_handler) (void);
   
   /* Exit value used when 'print_and_abort' is used.  */
 ! extern int obstack_exit_failure;
   
   /* Pointer to beginning of object being allocated or to be allocated next.
      Note that this might not be the final address of the object
---- 201,210 ----
+--- 221,230 ----
      more memory.  This can be set to a user defined function which
      should either abort gracefully or use longjump - but shouldn't
      return.  The default action is to print a message and abort.  */
-! extern DLL_VARIABLE void (*obstack_alloc_failed_handler) (void);
+! extern DLL_VARIABLE __attribute_noreturn__ void (*obstack_alloc_failed_handler) (void);
   
   /* Exit value used when 'print_and_abort' is used.  */
 ! extern DLL_VARIABLE int obstack_exit_failure;
diff --git a/gnulib-local/modules/fnmatch.diff b/gnulib-local/modules/fnmatch.diff
index 74ac97a2a..bcce9de10 100644
--- a/gnulib-local/modules/fnmatch.diff
+++ b/gnulib-local/modules/fnmatch.diff
@@ -6,14 +6,14 @@
   extensions
   snippet/arg-nonnull
 ! alloca          [test -n "$FNMATCH_H"]
+  flexmember      [test -n "$FNMATCH_H"]
   stdbool         [test -n "$FNMATCH_H"]
   wchar           [test -n "$FNMATCH_H"]
-  wctype-h        [test -n "$FNMATCH_H"]
 --- 11,17 ----
   Depends-on:
   extensions
   snippet/arg-nonnull
 ! alloca-opt      [test -n "$FNMATCH_H"]
+  flexmember      [test -n "$FNMATCH_H"]
   stdbool         [test -n "$FNMATCH_H"]
   wchar           [test -n "$FNMATCH_H"]
-  wctype-h        [test -n "$FNMATCH_H"]
-- 
2.47.3