Merge remote-tracking branch 'origin/nasm-2.14.xx'

Resolved Conflicts:
	Makefile.in
	Mkfiles/msvc.mak
	Mkfiles/openwcom.mak
	asm/nasm.c
	nasmlib/alloc.c

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/asm/nasm.c b/asm/nasm.c
index 48217455..149e1042 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -121,7 +121,7 @@ const struct ofmt *ofmt = &OF_DEFAULT;
 const struct ofmt_alias *ofmt_alias = NULL;
 const struct dfmt *dfmt;
 
-static FILE *error_file;        /* Where to write error messages */
+FILE *error_file;               /* Where to write error messages */
 
 FILE *ofile = NULL;
 struct optimization optimizing =
@@ -451,6 +451,8 @@ int main(int argc, char **argv)
 {
     timestamp();
 
+    error_file = stderr;
+
     iflag_set_default_cpu(&cpu);
     iflag_set_default_cpu(&cmd_cpu);
 
@@ -460,8 +462,6 @@ int main(int argc, char **argv)
     want_usage = terminate_after_phase = false;
     nasm_set_verror(nasm_verror_asm);
 
-    error_file = stderr;
-
     nasm_ctype_init();
     src_init();