luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1666-typemodule-casts' into 'master'

Browse Source 
gtypemodule: Cast *_init functions to void(*)(void) first

Closes #1666

See merge request GNOME/glib!617
This commit is contained in:
Emmanuele Bassi 2019-01-25 13:33:50 +00:00
commit 6db5101c4f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gobject/gtypemodule.h
View File

@ -204,12 +204,12 @@ type_name##_register_type (GTypeModule *type_module) \
sizeof (TypeName##Class), \ sizeof (TypeName##Class), \
(GBaseInitFunc) NULL, \ (GBaseInitFunc) NULL, \
(GBaseFinalizeFunc) NULL, \ (GBaseFinalizeFunc) NULL, \
(GClassInitFunc) type_name##_class_intern_init, \ (GClassInitFunc)(void (*)(void)) type_name##_class_intern_init, \
(GClassFinalizeFunc) type_name##_class_finalize, \ (GClassFinalizeFunc)(void (*)(void)) type_name##_class_finalize, \
NULL, /* class_data */ \ NULL, /* class_data */ \
sizeof (TypeName), \ sizeof (TypeName), \
0, /* n_preallocs */ \ 0, /* n_preallocs */ \
(GInstanceInitFunc) type_name##_init, \ (GInstanceInitFunc)(void (*)(void)) type_name##_init, \
NULL /* value_table */ \ NULL /* value_table */ \
}; \ }; \
type_name##_type_id = g_type_module_register_type (type_module, \ type_name##_type_id = g_type_module_register_type (type_module, \
@ -238,7 +238,7 @@ type_name##_register_type (GTypeModule *type_module) \
*/ */
#define G_IMPLEMENT_INTERFACE_DYNAMIC(TYPE_IFACE, iface_init) { \ #define G_IMPLEMENT_INTERFACE_DYNAMIC(TYPE_IFACE, iface_init) { \
const GInterfaceInfo g_implement_interface_info = { \ const GInterfaceInfo g_implement_interface_info = { \
(GInterfaceInitFunc) iface_init, NULL, NULL \ (GInterfaceInitFunc)(void (*)(void)) iface_init, NULL, NULL \
}; \ }; \
g_type_module_add_interface (type_module, g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \ g_type_module_add_interface (type_module, g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \
} }