From de3a2f5d2e7586e02098cd7cc9c50fbeb3cdd5b3 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 25 Dec 2019 13:19:11 +0100 Subject: [PATCH] utils: fix warnings with -Wredundant-decls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In file included from mm-sleep-monitor.c:30: mm-utils.h:28:18: error: redundant redeclaration of ‘singleton_instance’ [-Werror=redundant-decls] e 28 | static TYPE *singleton_instance | ^~~~~~~~~~~~~~~~~~ mm-utils.h:31:5: note: in expansion of macro ‘MM_DEFINE_SINGLETON_INSTANCE’ 31 | MM_DEFINE_SINGLETON_INSTANCE (TYPE); \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ mm-utils.h:65:5: note: in expansion of macro ‘MM_DEFINE_SINGLETON_WEAK_REF’ 65 | MM_DEFINE_SINGLETON_WEAK_REF (TYPE); \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- src/mm-utils.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mm-utils.h b/src/mm-utils.h index 2b0a9340..395c39e1 100644 --- a/src/mm-utils.h +++ b/src/mm-utils.h @@ -25,10 +25,9 @@ /*****************************************************************************/ #define MM_DEFINE_SINGLETON_INSTANCE(TYPE) \ - static TYPE *singleton_instance + static TYPE *singleton_instance; #define MM_DEFINE_SINGLETON_WEAK_REF(TYPE) \ - MM_DEFINE_SINGLETON_INSTANCE (TYPE); \ static void \ _singleton_instance_weak_ref_cb (gpointer data, \ GObject *where_the_object_was) \ @@ -43,7 +42,6 @@ } #define MM_DEFINE_SINGLETON_DESTRUCTOR(TYPE) \ - MM_DEFINE_SINGLETON_INSTANCE (TYPE); \ static void __attribute__((destructor)) \ _singleton_destructor (void) \ { \ @@ -61,8 +59,8 @@ #endif #define MM_DEFINE_SINGLETON_GETTER(TYPE, GETTER, GTYPE, ...) \ - MM_DEFINE_SINGLETON_INSTANCE (TYPE); \ - MM_DEFINE_SINGLETON_WEAK_REF (TYPE); \ + MM_DEFINE_SINGLETON_INSTANCE (TYPE) \ + MM_DEFINE_SINGLETON_WEAK_REF (TYPE) \ TYPE * \ GETTER (void) \ { \