diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-12-22 18:24:19 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-12-22 18:24:19 +0100 |
| commit | 5cf0b2d46617cdc52009da526c127ead57ab554f (patch) | |
| tree | 92596f73c44b3ffc30be1c67a8750dafec8f5319 | |
| parent | badf683b0aa693de9b1a7c1634ad20665463c503 (diff) | |
| download | busybox-5cf0b2d46617cdc52009da526c127ead57ab554f.tar.gz | |
bc: unbreak "z function" macro machinery
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | miscutils/bc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/miscutils/bc.c b/miscutils/bc.c index d8fbb6ed7..bdee14de4 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c @@ -2902,6 +2902,8 @@ static bool bc_lex_more_input(BcLex *l) IF_BC(static BC_STATUS zbc_lex_token(BcLex *l);) IF_DC(static BC_STATUS zdc_lex_token(BcLex *l);) +#define zbc_lex_token(...) (zbc_lex_token(__VA_ARGS__) COMMA_SUCCESS) +#define zdc_lex_token(...) (zdc_lex_token(__VA_ARGS__) COMMA_SUCCESS) static BC_STATUS zbc_lex_next(BcLex *l) { @@ -3100,6 +3102,7 @@ static BC_STATUS zbc_lex_comment(BcLex *l) } #define zbc_lex_comment(...) (zbc_lex_comment(__VA_ARGS__) COMMA_SUCCESS) +#undef zbc_lex_token static BC_STATUS zbc_lex_token(BcLex *l) { BcStatus s = BC_STATUS_SUCCESS; @@ -3290,6 +3293,7 @@ static BC_STATUS zbc_lex_token(BcLex *l) RETURN_STATUS(s); } +#define zbc_lex_token(...) (zbc_lex_token(__VA_ARGS__) COMMA_SUCCESS) #endif // ENABLE_BC #if ENABLE_DC @@ -3356,6 +3360,7 @@ static BC_STATUS zdc_lex_string(BcLex *l) } #define zdc_lex_string(...) (zdc_lex_string(__VA_ARGS__) COMMA_SUCCESS) +#undef zdc_lex_token static BC_STATUS zdc_lex_token(BcLex *l) { static const //BcLexType - should be this type, but narrower type saves size: @@ -3500,6 +3505,7 @@ static BC_STATUS zdc_lex_token(BcLex *l) RETURN_STATUS(s); } +#define zdc_lex_token(...) (zdc_lex_token(__VA_ARGS__) COMMA_SUCCESS) #endif // ENABLE_DC static void bc_parse_push(BcParse *p, char i) |