From 9858cecf020ab27396cf7ccd334877f0794aea58 Mon Sep 17 00:00:00 2001
From: Keith Kanios <keith@kanios.net>
Date: Mon, 8 Nov 2010 00:58:02 -0600
Subject: [PATCH] preproc.c: placate errors in OpenWatcom Compiler

---
 preproc.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/preproc.c b/preproc.c
index d0620721..c223fb72 100644
--- a/preproc.c
+++ b/preproc.c
@@ -4999,7 +4999,7 @@ static bool expand_mmacro(Token * tline)
 				}
 				t->next = new_Token(NULL, TOK_OTHER, ":", 0);
 			}
-			Line *l = new_Line();
+			l = new_Line();
 			l->first = copy_Token(label);
 			l->next = ei->current;
 			ei->current = l;
@@ -5136,7 +5136,10 @@ static char *pp_getline(void)
 {
     char *line;
     Token *tline;
-	ExpInv *ei;
+    ExpDef *ed;
+    ExpInv *ei;
+    Line *l;
+    int j;
 	
     while (1) {
         /*
@@ -5156,7 +5159,6 @@ static char *pp_getline(void)
 						ei->current = NULL;
 						continue;
 					}
-					Line *l = NULL;
 					l = ei->current;
 					ei->current = l->next;
 					ei->lineno++;
@@ -5184,7 +5186,7 @@ static char *pp_getline(void)
 					ei->current = ei->def->line;
 					ei->lineno = 0;
 					tline = copy_Token(ei->current->first);
-					int j = if_condition(tline, PP_WHILE);
+					j = if_condition(tline, PP_WHILE);
 					tline = NULL;
 					j = (((j < 0) ? COND_NEVER : j) ? COND_IF_TRUE : COND_IF_FALSE);
 					if (j == COND_IF_TRUE) {
@@ -5198,7 +5200,7 @@ static char *pp_getline(void)
 					continue;
 				} else {
 					istk->expansion = ei->prev;
-					ExpDef *ed = ei->def;
+					ed = ei->def;
 					if (ed != NULL) {
 						if ((ei->emitting == true) &&
 							(ed->max_depth == DEADMAN_LIMIT) &&
-- 
2.11.4.GIT