diff options
author | Keith Kanios <keith@kanios.net> | 2010-08-10 20:12:57 -0500 |
---|---|---|
committer | Keith Kanios <keith@kanios.net> | 2010-08-10 20:12:57 -0500 |
commit | 404589e55829c3d9cfd6411ae8f536033e561e80 (patch) | |
tree | 07924be715495a1793c23b937134d9909c2d9ecb /preproc.c | |
parent | 71f4f8426cd49834ec146ef002576deaf6272cc0 (diff) | |
download | nasm-404589e55829c3d9cfd6411ae8f536033e561e80.tar.gz |
preproc.c: modified deprecation warning for context-local label fallthrough
Diffstat (limited to 'preproc.c')
-rw-r--r-- | preproc.c | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -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; |