summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nasm.c5
-rw-r--r--nasm.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/nasm.c b/nasm.c
index 5479a739..14ef45bc 100644
--- a/nasm.c
+++ b/nasm.c
@@ -819,7 +819,7 @@ static void assemble_file (char *fname)
*q++ = '\0';
ofmt->symdef(value, 0L, 0L, 3, q);
}
- } else if (pass0 == 1) { /* pass == 1 */
+ } else if (pass == 1) { /* pass == 1 */
q = value;
validid = TRUE;
if (!isidstart(*q))
@@ -840,9 +840,12 @@ static void assemble_file (char *fname)
} else
special = NULL;
if (!is_extern(value)) { /* allow re-EXTERN to be ignored */
+ int temp = pass0;
+ pass0 = 1; /* fake pass 1 in labels.c */
declare_as_global (value, special, report_error);
define_label (value, seg_alloc(), 0L, NULL, FALSE, TRUE,
ofmt, report_error);
+ pass0 = temp;
}
} /* else pass0 == 1 */
break;
diff --git a/nasm.h b/nasm.h
index 3ad5bb47..1ec58a30 100644
--- a/nasm.h
+++ b/nasm.h
@@ -13,7 +13,7 @@
#define NASM_MAJOR_VER 0
#define NASM_MINOR_VER 98
-#define NASM_VER "0.98.19"
+#define NASM_VER "0.98.20"
#ifndef NULL
#define NULL 0