diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2018-12-10 21:28:59 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2018-12-10 21:28:59 -0800 |
| commit | 36e3c707908738ce15dfc75b5a6d57c3e2791e2a (patch) | |
| tree | 4b5f1276ff015d6e204b28f2ac245c4a3dc0e8bf /include/error.h | |
| parent | 2bc04aff90f0d6f2ce66158600592977691619f5 (diff) | |
| parent | 54aac9d3c1b501050e6e75823317a4e34d6b2066 (diff) | |
| download | nasm-36e3c707908738ce15dfc75b5a6d57c3e2791e2a.tar.gz | |
Merge remote-tracking branch 'origin/nasm-2.14.xx'
Resolved Conflicts:
asm/labels.c
include/error.h
version
Diffstat (limited to 'include/error.h')
| -rw-r--r-- | include/error.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/error.h b/include/error.h index c87ea68c..5d3dc22e 100644 --- a/include/error.h +++ b/include/error.h @@ -73,8 +73,9 @@ static inline vefunc nasm_set_verror(vefunc ve) */ #define ERR_DEBUG 0x00000000 /* put out debugging message */ -#define ERR_WARNING 0x00000001 /* warn only: no further action */ -#define ERR_NONFATAL 0x00000002 /* terminate assembly after phase */ +#define ERR_NOTE 0x00000001 /* additional error information */ +#define ERR_WARNING 0x00000002 /* warn only: no further action */ +#define ERR_NONFATAL 0x00000003 /* terminate assembly after phase */ #define ERR_FATAL 0x00000006 /* instantly fatal: exit with error */ #define ERR_PANIC 0x00000007 /* internal error: panic instantly * and dump core for reference */ |