summaryrefslogtreecommitdiff
path: root/output
diff options
context:
space:
mode:
authorH. Peter Anvin (Intel) <hpa@zytor.com>2018-12-12 17:48:38 -0800
committerH. Peter Anvin (Intel) <hpa@zytor.com>2018-12-12 17:48:38 -0800
commitdf4d3425993f80f0e56922368c845a40587a7dc0 (patch)
treefc173de75e8a28a9fc8673ae277138a5b7e922e9 /output
parenteb5b3ae0d3383cef2651ae642ad297bc1dc6f228 (diff)
downloadnasm-df4d3425993f80f0e56922368c845a40587a7dc0.tar.gz
warnings: rename ERR_WARN_* to WARN_*
The prefix ERR_WARN_ is unnecessarily long and may be a disincentive to create new warning categories. Change it to WARN_*, it is still plenty distinctive. This is equivalent to nasm-2.14.xx checkin 77f53ba6d4cb90e5a7e09b33357ed7c1fe9f6b9d. Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'output')
-rw-r--r--output/outdbg.c2
-rw-r--r--output/outelf.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/output/outdbg.c b/output/outdbg.c
index a318f921..b5496b98 100644
--- a/output/outdbg.c
+++ b/output/outdbg.c
@@ -375,7 +375,7 @@ dbg_pragma(const struct pragma *pragma)
errno = 0;
arg = strtoul(pragma->tail, &ep, 0);
if (errno || *nasm_skip_spaces(ep)) {
- nasm_error(ERR_WARNING | ERR_WARN_BAD_PRAGMA | ERR_PASS2,
+ nasm_error(ERR_WARNING | WARN_BAD_PRAGMA | ERR_PASS2,
"invalid %%pragma dbg maxdump argument");
return DIRR_ERROR;
} else {
diff --git a/output/outelf.c b/output/outelf.c
index 3fe76810..2ac8eb44 100644
--- a/output/outelf.c
+++ b/output/outelf.c
@@ -919,7 +919,7 @@ static void elf32_out(int32_t segto, const void *data,
}
if (gnu16) {
- nasm_warnf(ERR_WARN_GNUELF, "8- or 16-bit relocations "
+ nasm_warnf(WARN_GNUELF, "8- or 16-bit relocations "
"in ELF32 is a GNU extension");
} else if (asize != 4 && segment != NO_SEG) {
nasm_nonfatal("Unsupported non-32-bit ELF relocation");
@@ -945,7 +945,7 @@ rel12adr:
" segment base references");
} else {
if (wrt == NO_SEG) {
- nasm_warnf(ERR_WARN_GNUELF, "8- or 16-bit relocations "
+ nasm_warnf(WARN_GNUELF, "8- or 16-bit relocations "
"in ELF is a GNU extension");
elf_add_reloc(s, segment, 0, reltype);
} else {