Further sync of dfa.c.

2 files changed, 13 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 6f24933e..b80e151d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon May  2 23:44:34 2011  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* dfa.c (parse_bracket_exp): Sync with GNU grep, since we
+	now require C 90, go ahead and put non-constant values into
+	the array initializers.
+
+Mon May  2 23:37:09 2011  Corinna Vinschen  <vinschen@redhat.com>
+
+	* awk.h (small): Undef after include of <sigsegv.h> to compile
+	builtin.c on Cygwin.
+
 Fri Apr 29 12:29:56 2011  Arnold D. Robbins  <arnold@skeeve.com>
 
 	* dfa.c: Sync with GNU grep, mainly typos in comments.
diff --git a/dfa.c b/dfa.c
index 4e02dbb1..439f9647 100644
--- a/dfa.c
+++ b/dfa.c
@@ -1000,16 +1000,8 @@ parse_bracket_exp (void)
                   /* Defer to the system regex library about the meaning
                      of range expressions.  */
                   regex_t re;
-                  char pattern[6];
-                  char subject[2];
-
-                  pattern[0] = '[';
-                  pattern[1] = c1;
-                  pattern[2] = '-';
-                  pattern[3] = c2;
-                  pattern[4] = ']';
-                  pattern[5] = 0;
-		  subject[0] = subject[1] = 0;
+                  char pattern[6] = { '[', c1, '-', c2, ']', 0 };
+                  char subject[2] = { 0, 0 };
                   regcomp (&re, pattern, REG_NOSUB);
                   for (c = 0; c < NOTCHAR; ++c)
                     {