diff options
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/arith_yacc.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index e6e82f1..0802048 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-03-10 Jilles Tjoelker <jilles@stack.nl> + + * Fix logical or result value. + 2010-03-09 Herbert Xu <herbert@gondor.apana.org.au> * Fix binary operator parsing. diff --git a/src/arith_yacc.c b/src/arith_yacc.c index 74b95f8..6c5a720 100644 --- a/src/arith_yacc.c +++ b/src/arith_yacc.c @@ -253,7 +253,7 @@ static intmax_t or(int token, union yystype *val, int op, int noeval) b = or(token, val, yylex(), noeval | !!a); - return a | b; + return a || b; } static intmax_t cond(int token, union yystype *val, int op, int noeval) |