diff options
author | Keith Kanios <keith@kanios.net> | 2010-11-08 00:58:02 -0600 |
---|---|---|
committer | Keith Kanios <keith@kanios.net> | 2010-11-08 00:58:02 -0600 |
commit | 9858cecf020ab27396cf7ccd334877f0794aea58 (patch) | |
tree | 77ae22ae740c2af63f2e2421fa50f11db9ee81f6 | |
parent | d55a158cecc154e86d06a88edbf61bfe371e727c (diff) | |
download | nasm-9858cecf020ab27396cf7ccd334877f0794aea58.tar.gz |
preproc.c: placate errors in OpenWatcom Compilernasm-2.10rc2
-rw-r--r-- | preproc.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -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) && |