Merge branch 'master' into feature/cmake

2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 887c7397..ff048b2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-15         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* dfa.c (dfamust): Restore c90 compat by moving some
+	variable declarations to the top of the routine.
+
 2015-08-12         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* dfa.c: Sync with GNU grep. Yet again, again.
diff --git a/dfa.c b/dfa.c
index 6cdcabd3..82910fb7 100644
--- a/dfa.c
+++ b/dfa.c
@@ -3969,6 +3969,8 @@ dfamust (struct dfa const *d)
   bool exact = false;
   bool begline = false;
   bool endline = false;
+  size_t rj;
+  struct dfamust *dm;
 
   for (ri = 0; ri < d->tindex; ++ri)
     {
@@ -4141,7 +4143,7 @@ dfamust (struct dfa const *d)
                 }
             }
 
-          size_t rj = ri + 2;
+          rj = ri + 2;
           if (d->tokens[ri + 1] == CAT)
             {
               for (; rj < d->tindex - 1; rj += 2)
@@ -4172,7 +4174,7 @@ done:
   if (!*result)
     return NULL;
 
-  struct dfamust *dm = xmalloc (sizeof *dm);
+  dm = xmalloc (sizeof *dm);
   dm->exact = exact;
   dm->begline = begline;
   dm->endline = endline;