diff options
author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2018-12-13 16:43:43 -0800 |
---|---|---|
committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2018-12-13 16:43:43 -0800 |
commit | df2195b6a978448f640cae552858740d214886a4 (patch) | |
tree | ad9a7198f2b89ad36e6d06fc7bfb560b3fc0ce74 /include/error.h | |
parent | fef75c265a2dafb6482ffd4078f74f2a66fa2535 (diff) | |
parent | 3b91f4c117003a9f42717fe88257b6025790169e (diff) | |
download | nasm-df2195b6a978448f640cae552858740d214886a4.tar.gz |
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>
Diffstat (limited to 'include/error.h')
-rw-r--r-- | include/error.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/error.h b/include/error.h index 8d5084c8..a2146e97 100644 --- a/include/error.h +++ b/include/error.h @@ -41,6 +41,11 @@ #include "compiler.h" /* + * File pointer for error messages + */ +extern FILE *error_file; /* Error file descriptor */ + +/* * An error reporting function should look like this. */ void printf_func(2, 3) nasm_error(int severity, const char *fmt, ...); |