summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-07-08 08:33:14 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-07-08 08:33:14 -0700
commitddd08c3cccb4b68ecdb24d7a92eab6b2b82e8c68 (patch)
tree15120b07e7629d0b535bd4ec88ccef7e23842639
parentf86b8b22e17fa431cb0593a46aad95d8deb302d1 (diff)
downloadnasm-ddd08c3cccb4b68ecdb24d7a92eab6b2b82e8c68.tar.gz
Revert "expand_mmac_params: Expand local single macros unconditionally"
This reverts commit 985d880c15a5b26e59cdcec4af2eba0748ecfe1f. Revert due to BR 3026808. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--preproc.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/preproc.c b/preproc.c
index d54ee592..e2cc1a29 100644
--- a/preproc.c
+++ b/preproc.c
@@ -3822,7 +3822,14 @@ static Token *expand_mmac_params(Token * tline)
changed = true;
} else if (tline->type == TOK_PREPROC_ID &&
tline->text[0] == '%' && tline->text[1] == '$') {
- /* expand local macro */
+ /*
+ * In a sake of backward compatibility we allow
+ * to expand local single macro that early before
+ * pasting token code have place
+ *
+ * NOTE: that new code MUST use %+ macro to obtain
+ * same result
+ */
t = tline;
tline = tline->next;
tt = tokenize(t->text);