brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use the internal _G_DEFINE_TYPE_EXTENDED_CLASS_INIT macro

Browse Source 
This macro is internal to gobject so using it risks breaking Cogl if
glib changes its API. Instead we just use its expansion. Note that
glib provides two expansions for this depending on the glib version
but this only uses the one for older versions.

Reviewed-by: Robert Bragg <robert.bragg@intel.com>
This commit is contained in:
Neil Roberts 2014-03-21 17:16:34 +00:00
parent a972024ed7
commit 2e6156ef5e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cogl/cogl-gtype-private.h
View File

@ -191,7 +191,12 @@ cogl_##name##_get_gtype (void) \
static gpointer name##_parent_class = NULL; \
static gint Name##_private_offset; \
\
_G_DEFINE_TYPE_EXTENDED_CLASS_INIT(Name, name) \
static void \
name##_class_intern_init (gpointer klass) \
{ \
name##_parent_class = g_type_class_peek_parent (klass); \
name##_class_init ((Name##Class*) klass); \
} \
\
static inline gpointer \
name##_get_instance_private (Name *self) \