From 26572c6e37279dd947df8d85b8d553c512f42467 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin (Intel)" Date: Thu, 13 Dec 2018 16:51:45 -0800 Subject: [PATCH] warnings: change WARN_MNP -> WARN_MACRO_PARAMS This one got missed during constant name conversion. Make the constants match the options. Signed-off-by: H. Peter Anvin (Intel) --- asm/preproc.c | 4 ++-- include/error.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/asm/preproc.c b/asm/preproc.c index af77e14b..af990e13 100644 --- a/asm/preproc.c +++ b/asm/preproc.c @@ -4285,7 +4285,7 @@ again: m->casesense))) m = m->next; if (!m) - nasm_warnf(ERR_PASS1|WARN_MNP, + nasm_warnf(ERR_PASS1|WARN_MACRO_PARAMS, "macro `%s' exists, " "but not taking %d parameters", mstart->text, nparam); @@ -4585,7 +4585,7 @@ static MMacro *is_mmacro(Token * tline, Token *** params_array) * After all that, we didn't find one with the right number of * parameters. Issue a warning, and fail to expand the macro. */ - nasm_warnf(ERR_PASS1|WARN_MNP, + nasm_warnf(ERR_PASS1|WARN_MACRO_PARAMS, "macro `%s' exists, but not taking %d parameters", tline->text, nparam); nasm_free(params); diff --git a/include/error.h b/include/error.h index a2146e97..d5b4f852 100644 --- a/include/error.h +++ b/include/error.h @@ -108,7 +108,7 @@ static inline vefunc nasm_set_verror(vefunc ve) #define WARN_MASK WARN(~0) #define WARN_IDX(x) ((x) >> WARN_SHR) -#define WARN_MNP WARN( 1) /* macro-num-parameters warning */ +#define WARN_MACRO_PARAMS WARN( 1) /* macro-num-parameters warning */ #define WARN_MACRO_SELFREF WARN( 2) /* macro self-reference */ #define WARN_MACRO_DEFAULTS WARN( 3) /* macro default parameters check */ #define WARN_ORPHAN_LABELS WARN( 4) /* orphan label (no colon, and alone on line) */