commit | 9215e8e1d0fe474ffd3e16c1a07a0f97089e6224 | [log] [tgz] |
---|---|---|
author | Nico Weber <thakis@chromium.org> | Mon Oct 18 15:16:22 2021 -0400 |
committer | Nico Weber <thakis@chromium.org> | Mon Oct 18 15:16:22 2021 -0400 |
tree | 1229e723f9a28d6cb239dcbef2d39ab126085c6a | |
parent | 335fe83e133e1a113e87994e000b062047c662fc [diff] |
nasm: Cherry-pick -Wbitwise-instead-of-logical fix This cherry-picks https://github.com/netwide-assembler/nasm/pull/17 Bug: chromium:1255745 Change-Id: I230b9ab9fd0a8baa1cdc8dd6e62cdc069cb14070
diff --git a/asm/preproc.c b/asm/preproc.c index 8415d57..10b2fc4 100644 --- a/asm/preproc.c +++ b/asm/preproc.c
@@ -2700,7 +2700,7 @@ t = tline = expand_smacro(tline); while (tok_white(t) || - (needtype == TOK_NUMBER && (tok_is(t, '-') | tok_is(t, '+')))) + (needtype == TOK_NUMBER && (tok_is(t, '-') || tok_is(t, '+')))) t = t->next; j = tok_type(t, needtype);