diff --git a/shared/nm-utils/nm-glib.h b/shared/nm-utils/nm-glib.h
index b7534edd2a..e941e0673c 100644
--- a/shared/nm-utils/nm-glib.h
+++ b/shared/nm-utils/nm-glib.h
@@ -424,12 +424,14 @@ g_steal_pointer (gpointer pp)
 
 	return ref;
 }
-
-/* type safety */
-#define g_steal_pointer(pp) \
-  (0 ? (*(pp)) : (g_steal_pointer) (pp))
 #endif
 
+#ifdef g_steal_pointer
+#undef g_steal_pointer
+#endif
+#define g_steal_pointer(pp) \
+	((typeof (*(pp))) g_steal_pointer (pp))
+
 /*****************************************************************************/
 
 static inline gboolean