>From 3ea42da7900b8c1bf4837bfd9578e7aa17c4e94d Mon Sep 17 00:00:00 2001
From: Arnold Robbins <address@hidden>
Date: Fri, 2 Sep 2016 15:27:12 -0700
Subject: [PATCH 1/2] dfa: port to C90

* src/dfa.c (dfamust): Avoid declarations after statement (Bug#21486).
---
 src/dfa.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/dfa.c b/src/dfa.c
index ff3721c..a1bcece 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3747,9 +3747,11 @@ dfamust (struct dfa const *d)
   bool exact = false;
   bool begline = false;
   bool endline = false;
+  size_t rj;
   bool need_begline = false;
   bool need_endline = false;
   bool case_fold_unibyte = d->syntax.case_fold && MB_CUR_MAX == 1;
+  struct dfamust *dm;
 
   for (ri = 0; ri < d->tindex; ++ri)
     {
@@ -3926,7 +3928,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)
@@ -3955,7 +3957,7 @@ dfamust (struct dfa const *d)
     }
  done:;
 
-  struct dfamust *dm = NULL;
+  dm = NULL;
   if (*result)
     {
       dm = xmalloc (sizeof *dm);
-- 
2.7.4