aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2018-12-27 11:37:22 -0800
committerH. Peter Anvin <hpa@zytor.com>2018-12-27 11:37:22 -0800
commitbd2803964e776b7e3cfa8292ed513aba32b1724c (patch)
tree2ed9ea6bea86f551f9aa940606edfb2e95ed7a5c /include
parent2f0f5b01891a61b7b632c1704ecb3f27d561266a (diff)
parent81f98fe79be23174e2d6ddd9f17a5cfb9ca71ec7 (diff)
downloadnasm-bd2803964e776b7e3cfa8292ed513aba32b1724c.tar.gz
nasm-bd2803964e776b7e3cfa8292ed513aba32b1724c.tar.xz
nasm-bd2803964e776b7e3cfa8292ed513aba32b1724c.zip
Merge tag 'nasm-2.14.03rc1'
NASM 2.14.03rc1 Resolved Conflicts: asm/labels.c include/error.h Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'include')
-rw-r--r--include/error.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/error.h b/include/error.h
index 03a220ec..03380764 100644
--- a/include/error.h
+++ b/include/error.h
@@ -90,6 +90,7 @@ static inline vefunc nasm_set_verror(vefunc ve)
#define ERR_PANIC 0x00000007 /* internal error: panic instantly
* and dump core for reference */
#define ERR_MASK 0x00000007 /* mask off the above codes */
+#define ERR_UNDEAD 0x00000008 /* skip if we already have errors */
#define ERR_NOFILE 0x00000010 /* don't give source file name/line */
#define ERR_HERE 0x00000020 /* point to a specific source location */
#define ERR_USAGE 0x00000040 /* print a usage message */