aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Nikula <jani@nikula.org>2015-02-23 18:56:15 +0200
committerDavid Bremner <david@tethera.net>2015-02-25 23:09:39 +0100
commit08757767de5c148cea8e7b97274789f851fbd854 (patch)
tree126fe667dfb896fd19c8016d8613922a6cc344fb
parent41b870fba5d09653dd9f22315cbca47e9a8c0d31 (diff)
lib: fix clang build warnings
Fix the following warning produced by clang 3.5.0: lib/message.cc:899:4: warning: comparison of constant 64 with expression of type 'notmuch_message_flag_t' (aka '_notmuch_message_flag') is always true [-Wtautological-constant-out-of-range-compare] ! NOTMUCH_TEST_BIT (message->lazy_flags, flag)) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./lib/notmuch-private.h:70:6: note: expanded from macro 'NOTMUCH_TEST_BIT' (_NOTMUCH_VALID_BIT(bit) ? !!((val) & (1ull << (bit))) : 0) ^~~~~~~~~~~~~~~~~~~~~~~ ./lib/notmuch-private.h:68:26: note: expanded from macro '_NOTMUCH_VALID_BIT' ((bit) >= 0 && (bit) < CHAR_BIT * sizeof (unsigned long long)) ~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-rw-r--r--lib/notmuch-private.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
index 02a8fc62..8a1f2fab 100644
--- a/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@ -65,7 +65,7 @@ NOTMUCH_BEGIN_DECLS
/* Robust bit test/set/reset macros */
#define _NOTMUCH_VALID_BIT(bit) \
- ((bit) >= 0 && (bit) < CHAR_BIT * sizeof (unsigned long long))
+ ((bit) >= 0 && ((unsigned long) bit) < CHAR_BIT * sizeof (unsigned long long))
#define NOTMUCH_TEST_BIT(val, bit) \
(_NOTMUCH_VALID_BIT(bit) ? !!((val) & (1ull << (bit))) : 0)
#define NOTMUCH_SET_BIT(valp, bit) \