summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2021-10-18 15:16:22 -0400
committerNico Weber <thakis@chromium.org>2021-10-18 15:16:22 -0400
commit9215e8e1d0fe474ffd3e16c1a07a0f97089e6224 (patch)
tree1229e723f9a28d6cb239dcbef2d39ab126085c6a
parent335fe83e133e1a113e87994e000b062047c662fc (diff)
downloadnasm-9215e8e1d0fe474ffd3e16c1a07a0f97089e6224.tar.gz
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
-rw-r--r--asm/preproc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/preproc.c b/asm/preproc.c
index 8415d572..10b2fc4d 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -2700,7 +2700,7 @@ iftype:
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);