From 23bf70e65471e85ebc341782c0650de4a2bd6bbd Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 6 Dec 2017 10:04:50 +0100 Subject: [PATCH] shared: propagate type for g_object_ref() See related bug https://bugzilla.gnome.org/show_bug.cgi?id=790697 (cherry picked from commit 7ca601d529329f756340961fcd153399b2f5063c) (cherry picked from commit 85b1c11b8f5e7399f1680eaafc7bf4bee827db7f) --- shared/nm-utils/nm-glib.h | 5 +++++ shared/nm-utils/nm-macros-internal.h | 1 + 2 files changed, 6 insertions(+) diff --git a/shared/nm-utils/nm-glib.h b/shared/nm-utils/nm-glib.h index dd18756a16..c6bee4ea71 100644 --- a/shared/nm-utils/nm-glib.h +++ b/shared/nm-utils/nm-glib.h @@ -452,4 +452,9 @@ _nm_g_variant_new_take_string (gchar *string) } #define g_variant_new_take_string _nm_g_variant_new_take_string +#if !GLIB_CHECK_VERSION (2, 56, 0) +#define g_object_ref(Obj) ((typeof(Obj)) g_object_ref (Obj)) +#define g_object_ref_sink(Obj) ((typeof(Obj)) g_object_ref_sink (Obj)) +#endif + #endif /* __NM_GLIB_H__ */ diff --git a/shared/nm-utils/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h index 5fe4bc50a1..fb8d3f5840 100644 --- a/shared/nm-utils/nm-macros-internal.h +++ b/shared/nm-utils/nm-macros-internal.h @@ -528,6 +528,7 @@ nm_g_object_ref (gpointer obj) g_object_ref (obj); return obj; } +#define nm_g_object_ref(obj) ((typeof (obj)) nm_g_object_ref (obj)) static inline void nm_g_object_unref (gpointer obj)