summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-07-08 08:34:41 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-07-08 08:34:41 -0700
commit13dbfad76b4d3dbf27ef41761873584c6bd9fd7f (patch)
tree6cbd474ea4b9258d7c2d5aa85f68e44b47c44a43
parent6f5f7ef417c37c154d10c2b3813808ad3fa65fd7 (diff)
downloadnasm-13dbfad76b4d3dbf27ef41761873584c6bd9fd7f.tar.gz
Revert "expand_mmac_params: Don't forget to handle TOK_OTHER"
This reverts commit 51fd86e0fed8f5162f8c1e45e4ceaf237d6e5539. Revert due to BR 3026808. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--preproc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/preproc.c b/preproc.c
index 0ae21ccb..a881dcef 100644
--- a/preproc.c
+++ b/preproc.c
@@ -3824,9 +3824,8 @@ static Token *expand_mmac_params(Token * tline)
tline->text[0] == '%' && tline->text[1] == '$' &&
(tok_type_(tline->next, TOK_ID) ||
tok_type_(tline->next, TOK_PREPROC_ID) ||
- tok_type_(tline->next, TOK_FLOAT) ||
tok_type_(tline->next, TOK_NUMBER) ||
- tok_type_(tline->next, TOK_OTHER))) {
+ tok_type_(tline->next, TOK_FLOAT))) {
/*
* In a sake of backward compatibility we allow
* to expand local single macro that early before