From 404589e55829c3d9cfd6411ae8f536033e561e80 Mon Sep 17 00:00:00 2001 From: Keith Kanios Date: Tue, 10 Aug 2010 20:12:57 -0500 Subject: preproc.c: modified deprecation warning for context-local label fallthrough --- preproc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/preproc.c b/preproc.c index 4aff7043..186e7244 100644 --- a/preproc.c +++ b/preproc.c @@ -1459,21 +1459,22 @@ static Context *get_ctx(const char *name, const char **namep, if (namep) *namep = name; - if (!all_contexts) { + if (!all_contexts) return ctx; - } else { - error(ERR_WARNING, "context-local label expansion" - " to outer contexts will be deprecated" - " starting in NASM 2.10, please update your" - " code accordingly"); - } do { /* Search for this smacro in found context */ m = hash_findix(&ctx->localmac, name); while (m) { - if (!mstrcmp(m->name, name, m->casesense)) + if (!mstrcmp(m->name, name, m->casesense)) { + if ((i > 0) && (all_contexts == true)) { + error(ERR_WARNING, "context-local label expansion" + " to outer contexts will be deprecated" + " starting in NASM 2.10, please update your" + " code accordingly"); + } return ctx; + } m = m->next; } ctx = ctx->next; -- cgit v1.2.1