SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utils: fix warnings with -Wredundant-decls

Browse Source 
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);                                \
        |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
This commit is contained in:
Aleksander Morgado
2020-01-30 11:59:14 +01:00
parent a246c36087
commit de3a2f5d2e
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-utils.h
+3 -5
View File
@@ -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) \
{ \