Revert "expand_mmac_params: Expand local single macros unconditionally"

This reverts commit 1f6741fc78.

Revert due to BR 3026808.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2010-07-08 08:33:47 -07:00
parent ddd08c3ccc
commit 6f5f7ef417

View File

@ -3821,7 +3821,12 @@ static Token *expand_mmac_params(Token * tline)
delete_Token(t);
changed = true;
} else if (tline->type == TOK_PREPROC_ID &&
tline->text[0] == '%' && tline->text[1] == '$') {
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))) {
/*
* In a sake of backward compatibility we allow
* to expand local single macro that early before