summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Kanios <keith@kanios.net>2010-08-14 12:47:45 -0500
committerKeith Kanios <keith@kanios.net>2010-08-14 12:47:45 -0500
commit88d947e909c00828418900ab8defefd532e7d1f4 (patch)
tree9e9f43bdf51376336bc68a7740584a6e09148ace
parentc71cb6b72a6e74b661b325cdf6378577db2f32c7 (diff)
downloadnasm-88d947e909c00828418900ab8defefd532e7d1f4.tar.gz
preproc.c: revamped context-local fall-through warning message
-rw-r--r--preproc.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/preproc.c b/preproc.c
index f04434b9..5fafbd4c 100644
--- a/preproc.c
+++ b/preproc.c
@@ -1482,16 +1482,17 @@ static Context *get_ctx(const char *name, const char **namep,
m = hash_findix(&ctx->localmac, name);
while (m) {
if (!mstrcmp(m->name, name, m->casesense)) {
- /* NOTE: obsolete since 2.10 */
+ /* NOTE: deprecated as of 2.10 */
static int once = 0;
if (!once) {
error(ERR_WARNING, "context-local macro expansion"
- " to outer contexts will be deprecated"
- " starting in NASM 2.10, please update your"
- " code accordingly");
+ " fall-through (automatic searching of outer"
+ " contexts) will be deprecated starting in"
+ " NASM 2.10, please see the NASM Manual for"
+ " more information");
once = 1;
}
- error(ERR_WARNING, "`%s': context through macro expansion", name);
+ error(ERR_WARNING, "`%s': context-local macro expansion fall-through", name);
return ctx;
}
m = m->next;