From: David Bremner <david@tethera.net>
Date: Mon, 15 Feb 2021 02:28:55 +0000 (-0400)
Subject: lib: use a stricter unused macro
X-Git-Tag: 0.32_rc0~77
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=1b2ec7578e7dd442bd76d620564553aaa70e9e9b

lib: use a stricter unused macro

This would have caught bugs like the one corrected in the previous commit.
---

diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
index 2fbf7ab9..2f5ccd6a 100644
--- a/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@ -76,7 +76,7 @@ NOTMUCH_BEGIN_DECLS
 #define NOTMUCH_CLEAR_BIT(valp,  bit) \
     (_NOTMUCH_VALID_BIT (bit) ? (*(valp) &= ~(1ull << (bit))) : *(valp))
 
-#define unused(x) x __attribute__ ((unused))
+#define unused(x) x ## _unused __attribute__ ((unused))
 
 /* Thanks to Andrew Tridgell's (SAMBA's) talloc for this definition of
  * unlikely. The talloc source code comes to us via the GNU LGPL v. 3.