luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-08 20:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that MAX_ALLOWED keeps working with the type macros

Browse Source 
When using the GLIB_VERSION_MAX_ALLOWED macro to define the upper bound
of allowed API the G_DEFINE_TYPE_EXTENDED starts warning about the newly
added g_type_class_adjust_private_offset() function; this effectively
introduces a run-time dependency on GLib 2.38 even if we don't use its
API explicitly.

https://bugzilla.gnome.org/show_bug.cgi?id=703191
This commit is contained in:
Emmanuele Bassi 2013-06-27 15:15:40 +01:00 committed by Colin Walters
parent 4cd7bcaf00
commit a4c352cd99
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gobject/gtype.h
View File

@ -1636,19 +1636,37 @@ guint g_type_get_type_registration_serial (void);
#define G_PRIVATE_FIELD(TypeName, inst, field_type, field_name) \ #define G_PRIVATE_FIELD(TypeName, inst, field_type, field_name) \
G_STRUCT_MEMBER (field_type, inst, G_PRIVATE_OFFSET (TypeName, field_name)) G_STRUCT_MEMBER (field_type, inst, G_PRIVATE_OFFSET (TypeName, field_name))
#define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \ /* we need to have this macro under conditional expansion, as it references
\ * a function that has been added in 2.38. see bug:
static void type_name##_init (TypeName *self); \ * https://bugzilla.gnome.org/show_bug.cgi?id=703191
static void type_name##_class_init (TypeName##Class *klass); \ */
static gpointer type_name##_parent_class = NULL; \ #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
static gint TypeName##_private_offset; \ #define _G_DEFINE_TYPE_EXTENDED_CLASS_INIT(TypeName, type_name) \
static void type_name##_class_intern_init (gpointer klass) \ static void type_name##_class_intern_init (gpointer klass) \
{ \ { \
type_name##_parent_class = g_type_class_peek_parent (klass); \ type_name##_parent_class = g_type_class_peek_parent (klass); \
if (TypeName##_private_offset != 0) \ if (TypeName##_private_offset != 0) \
g_type_class_adjust_private_offset (klass, &TypeName##_private_offset); \ g_type_class_adjust_private_offset (klass, &TypeName##_private_offset); \
type_name##_class_init ((TypeName##Class*) klass); \ type_name##_class_init ((TypeName##Class*) klass); \
} \ }
#else
#define _G_DEFINE_TYPE_EXTENDED_CLASS_INIT(TypeName, type_name) \
static void type_name##_class_intern_init (gpointer klass) \
{ \
type_name##_parent_class = g_type_class_peek_parent (klass); \
type_name##_class_init ((TypeName##Class*) klass); \
}
#endif /* GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 */
#define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \
\
static void type_name##_init (TypeName *self); \
static void type_name##_class_init (TypeName##Class *klass); \
static gpointer type_name##_parent_class = NULL; \
static gint TypeName##_private_offset; \
\
_G_DEFINE_TYPE_EXTENDED_CLASS_INIT(TypeName, type_name) \
\ \
static inline gpointer \ static inline gpointer \
type_name##_get_instance_private (TypeName *self) \ type_name##_get_instance_private (TypeName *self) \