Merge branch 'gawk-5.1-stable'

4 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index df5db6fd..9f5b2f4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-07-29         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* custom.h (FLEXIBLE_ARRAY_MEMBER): Define to 1 for dfa.h.
+
 2020-07-28         Arnold D. Robbins     <arnold@skeeve.com>
 
 	Eliminate 'iszero: redefined' warning from tcc.
diff --git a/custom.h b/custom.h
index 61d339d5..aa0d7d61 100644
--- a/custom.h
+++ b/custom.h
@@ -99,5 +99,6 @@ typedef unsigned long long uint_fast64_t;
 #else
 # define _GL_ATTRIBUTE_PURE /* empty */
 #endif
+#define FLEXIBLE_ARRAY_MEMBER	1
 
 #include "mbsupport.h" /* defines stuff for DJGPP to fake MBS */
diff --git a/support/ChangeLog b/support/ChangeLog
index 5a6c4342..fc3500a9 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,7 @@
+2020-07-29         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* dfa.h: Synced from GNULIB.
+
 2020-07-26         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* cdefs.h, dfa.c, libc-config.h, localeinfo.c, localeinfo.h,
diff --git a/support/dfa.h b/support/dfa.h
index 80e8dbab..c5bff898 100644
--- a/support/dfa.h
+++ b/support/dfa.h
@@ -31,7 +31,7 @@ struct dfamust
   bool exact;
   bool begline;
   bool endline;
-  char *must;
+  char must[FLEXIBLE_ARRAY_MEMBER];
 };
 
 /* The dfa structure. It is completely opaque. */