diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2019-12-25 13:19:11 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2020-01-30 11:59:14 +0100 |
| commit | de3a2f5d2e7586e02098cd7cc9c50fbeb3cdd5b3 (patch) | |
| tree | a6745bd6d5cc09e89eaaf5784253d0912cc5d9fd | |
| parent | a246c36087986829f26ca624553fd4940c37a54b (diff) | |
utils: fix warnings with -Wredundant-decls
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); \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
| -rw-r--r-- | src/mm-utils.h | 8 |
1 files 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) \ { \ |