diff options
| -rw-r--r-- | asm/nasm.c | 6 | ||||
| -rw-r--r-- | include/error.h | 1 |
2 files changed, 4 insertions, 3 deletions
@@ -1810,8 +1810,10 @@ static void nasm_verror_gnu(int severity, const char *fmt, va_list ap) if (!(severity & ERR_NOFILE)) { src_get(&lineno, ¤tfile); - if (!currentfile || (severity & ERR_TOPFILE)) { - currentfile = inname[0] ? inname : outname[0] ? outname : NULL; + if (!currentfile) { + currentfile = inname && inname[0] ? + inname : outname && outname[0] ? + outname : NULL; lineno = 0; } } diff --git a/include/error.h b/include/error.h index 3d2b7a1a..d2f04f4c 100644 --- a/include/error.h +++ b/include/error.h @@ -72,7 +72,6 @@ static inline vefunc nasm_set_verror(vefunc ve) * and dump core for reference */ #define ERR_MASK 0x00000007 /* mask off the above codes */ #define ERR_NOFILE 0x00000010 /* don't give source file name/line */ -#define ERR_TOPFILE 0x00000020 /* give the top input file name only */ #define ERR_USAGE 0x00000040 /* print a usage message */ #define ERR_PASS1 0x00000080 /* only print this error on pass 1 */ #define ERR_PASS2 0x00000100 /* only print this error on pass 2 */ |