From 45200a42d3de9a022584f98200ec141f46dcdf95 Mon Sep 17 00:00:00 2001
From: Paul Smith <psmith@gnu.org>
Date: Sun, 24 Apr 2016 11:27:57 -0400
Subject: [PATCH] Allow compiling with an ISO C 1989/1990 compiler.

* posixos.c (jobserver_post_child): Use C89 for loop syntax.
* remake.c (update_goal_chain): Ditto.
* variable.c (parse_variable_definition): Ditto.
---
 posixos.c  | 23 +++++++++++++----------
 remake.c   |  4 +++-
 variable.c |  3 ++-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/posixos.c b/posixos.c
index 8c270010..4a88b3cf 100644
--- a/posixos.c
+++ b/posixos.c
@@ -193,16 +193,19 @@ jobserver_post_child (int recursive)
 {
 #if defined(F_GETFD) && defined(F_SETFD)
   if (!recursive && job_fds[0] >= 0)
-    for (int i = 0; i < 2; ++i)
-      {
-        int flags;
-        EINTRLOOP (flags, fcntl (job_fds[i], F_GETFD));
-        if (flags >= 0)
-          {
-            int r;
-            EINTRLOOP (r, fcntl (job_fds[i], F_SETFD, flags & ~FD_CLOEXEC));
-          }
-      }
+    {
+      unsigned int i;
+      for (i = 0; i < 2; ++i)
+        {
+          int flags;
+          EINTRLOOP (flags, fcntl (job_fds[i], F_GETFD));
+          if (flags >= 0)
+            {
+              int r;
+              EINTRLOOP (r, fcntl (job_fds[i], F_SETFD, flags & ~FD_CLOEXEC));
+            }
+        }
+    }
 #endif
 }
 
diff --git a/remake.c b/remake.c
index 1722474a..c837903e 100644
--- a/remake.c
+++ b/remake.c
@@ -271,10 +271,12 @@ update_goal_chain (struct goaldep *goaldeps)
 void
 show_goal_error ()
 {
+  struct goaldep *goal;
+
   if ((goal_dep->flags & (RM_INCLUDED|RM_DONTCARE)) != RM_INCLUDED)
     return;
 
-  for (struct goaldep *goal = goal_list; goal; goal = goal->next)
+  for (goal = goal_list; goal; goal = goal->next)
     if (goal_dep->file == goal->file)
       {
         if (goal->error)
diff --git a/variable.c b/variable.c
index b0d8d69c..9c932d4d 100644
--- a/variable.c
+++ b/variable.c
@@ -1449,6 +1449,7 @@ parse_variable_definition (const char *p, struct variable *var)
           /* This begins a variable expansion reference.  Make sure we don't
              treat chars inside the reference as assignment tokens.  */
           char closeparen;
+          unsigned int count;
 
           c = *p++;
           if (c == '(')
@@ -1463,7 +1464,7 @@ parse_variable_definition (const char *p, struct variable *var)
 
           /* P now points past the opening paren or brace.
              Count parens or braces until it is matched.  */
-          for (unsigned int count = 1; *p != '\0'; ++p)
+          for (count = 1; *p != '\0'; ++p)
             {
               if (*p == closeparen && --count == 0)
                 {