From 94e314c9146892b48db43c82b9f8dba8fae27d10 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Thu, 16 Sep 2021 13:58:10 +0200 Subject: [PATCH] pkg/nimble: fix `if(IS_ACTIVE(..) && CONSTANT)` with llvm Fixes ``` /home/kaspar/src/riot.rs/pkg/nimble/autoadv/nimble_autoadv.c:163:46: error: use of logical '&&' with constant operand [-Werror,-Wconstant-logical-operand] if (IS_ACTIVE(NIMBLE_AUTOADV_FLAG_FIELD) && BLUETIL_AD_FLAGS_DEFAULT) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~ /home/kaspar/src/riot.rs/pkg/nimble/autoadv/nimble_autoadv.c:163:46: note: use '&' for a bitwise operation if (IS_ACTIVE(NIMBLE_AUTOADV_FLAG_FIELD) && BLUETIL_AD_FLAGS_DEFAULT) { ^~ & /home/kaspar/src/riot.rs/pkg/nimble/autoadv/nimble_autoadv.c:163:46: note: remove constant to silence this warning if (IS_ACTIVE(NIMBLE_AUTOADV_FLAG_FIELD) && BLUETIL_AD_FLAGS_DEFAULT) { ~^~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. ``` --- pkg/nimble/autoadv/nimble_autoadv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/nimble/autoadv/nimble_autoadv.c b/pkg/nimble/autoadv/nimble_autoadv.c index a2f0213665..899a21e503 100644 --- a/pkg/nimble/autoadv/nimble_autoadv.c +++ b/pkg/nimble/autoadv/nimble_autoadv.c @@ -160,7 +160,7 @@ void nimble_autoadv_reset(void) int rc = 0; (void) rc; - if (IS_ACTIVE(NIMBLE_AUTOADV_FLAG_FIELD) && BLUETIL_AD_FLAGS_DEFAULT) { + if (IS_ACTIVE(NIMBLE_AUTOADV_FLAG_FIELD) && BLUETIL_AD_FLAGS_DEFAULT != 0) { rc = bluetil_ad_init_with_flags(&_ad, buf, sizeof(buf), BLUETIL_AD_FLAGS_DEFAULT); assert(rc == BLUETIL_AD_OK);