From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 9 Sep 2014 11:49:44 +0000 (+0100)
Subject: Add _DBUS_GNUC_UNUSED, and use it in _DBUS_STATIC_ASSERT
X-Git-Tag: dbus-1.9.0~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e3d08d45cb9a9ceb2c077875eeb38306dad37b8;p=thirdparty%2Fdbus.git

Add _DBUS_GNUC_UNUSED, and use it in _DBUS_STATIC_ASSERT

This means we can use _DBUS_STATIC_ASSERT at non-global scope without
tripping -Wunused-local-typedefs.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83767
Reviewed-by: Alban Crequy <alban.crequy@collabora.co.uk>
---

diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index c64d7566d..4658b67b6 100644
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -371,7 +371,7 @@ dbus_bool_t _dbus_get_local_machine_uuid_encoded (DBusString *uuid_str);
 #define _DBUS_PASTE(a, b) _DBUS_PASTE2 (a, b)
 #define _DBUS_STATIC_ASSERT(expr) \
   typedef struct { char _assertion[(expr) ? 1 : -1]; } \
-  _DBUS_PASTE (_DBUS_STATIC_ASSERT_, __LINE__)
+  _DBUS_PASTE (_DBUS_STATIC_ASSERT_, __LINE__) _DBUS_GNUC_UNUSED
 
 DBUS_END_DECLS
 
diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h
index cae4100e4..8d6c3000a 100644
--- a/dbus/dbus-macros.h
+++ b/dbus/dbus-macros.h
@@ -69,9 +69,12 @@
   __attribute__((__format__ (__printf__, format_idx, arg_idx)))
 #define _DBUS_GNUC_NORETURN                         \
   __attribute__((__noreturn__))
+#define _DBUS_GNUC_UNUSED                           \
+  __attribute__((__unused__))
 #else   /* !__GNUC__ */
 #define _DBUS_GNUC_PRINTF( format_idx, arg_idx )
 #define _DBUS_GNUC_NORETURN
+#define _DBUS_GNUC_UNUSED
 #endif  /* !__GNUC__ */
 
 #if    __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)