Attachment 936434 Details for Bug 1140523 – silence a compiler warning in the previous patch

[patch] silence a compiler warning in the previous patch

0009-Add-_DBUS_GNUC_UNUSED-and-use-it-in-_DBUS_STATIC_ASS.patch (text/plain), 1.62 KB, created by Murray McAllister on 2014-09-11 08:30:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Murray McAllister

Created: 2014-09-11 08:30:22 UTC

Size: 1.62 KB

patch

obsolete

>From 8bfb46106c20379d175da3113e1b89c1e54ee04d Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 9 Sep 2014 12:49:44 +0100
>Subject: [PATCH 09/11] 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.
>
>Reviewed-by: Alban Crequy <alban.crequy@collabora.co.uk>
>---
> dbus/dbus-internals.h | 2 +-
> dbus/dbus-macros.h    | 3 +++
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
>index c64d756..4658b67 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 cae4100..8d6c300 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)
>-- 
>2.1.0
>

Actions: View | Diff

Attachments on bug 1140523: 936433 | 936434 | 936435