From 4eb5ba8b026b1aed9c007ed5df30b368869cc59a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 19 Feb 2016 19:59:05 +0100 Subject: [PATCH] macros: split macro NM_GOBJECT_PROPERTIES_DEFINE() in two Sometimes we don't need the _notify() helper which results in a unused-function warning. --- shared/nm-macros-internal.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/shared/nm-macros-internal.h b/shared/nm-macros-internal.h index 348f832cd8..9971f15c8c 100644 --- a/shared/nm-macros-internal.h +++ b/shared/nm-macros-internal.h @@ -271,13 +271,16 @@ _NM_IN_STRSET_streq (const char *x, const char *s) /*****************************************************************************/ -#define NM_GOBJECT_PROPERTIES_DEFINE(obj_type, ...) \ +#define NM_GOBJECT_PROPERTIES_DEFINE_BASE(...) \ typedef enum { \ _PROPERTY_ENUMS_0, \ __VA_ARGS__ \ _PROPERTY_ENUMS_LAST, \ } _PropertyEnums; \ -static GParamSpec *obj_properties[_PROPERTY_ENUMS_LAST] = { NULL, }; \ +static GParamSpec *obj_properties[_PROPERTY_ENUMS_LAST] = { NULL, } + +#define NM_GOBJECT_PROPERTIES_DEFINE(obj_type, ...) \ +NM_GOBJECT_PROPERTIES_DEFINE_BASE (__VA_ARGS__); \ static inline void \ _notify (obj_type *obj, _PropertyEnums prop) \ { \