luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 18:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

gtype: cast *_init functions to void(*)(void) first

Browse Source 
The *_init() functions have prototypes incompatible with *InitFunc types they
are being cast to. This upsets GCC 8's -Wcast-function-type that's enabled by
default with -Wextra.

Let's not have the public header files emit a warning and neutralize it by
doing a void(*)(void) cast first.

https://bugzilla.gnome.org/show_bug.cgi?id=793272
This commit is contained in:
Lubomir Rintel 2018-02-07 17:27:54 +00:00 committed by Philip Withnall
parent 76fdf67ae5
commit cdcd6be206
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/gtype.h
View File

@ -1790,7 +1790,7 @@ guint g_type_get_type_registration_serial (void);
*/ */
#define G_IMPLEMENT_INTERFACE(TYPE_IFACE, iface_init) { \ #define G_IMPLEMENT_INTERFACE(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_add_interface_static (g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \ g_type_add_interface_static (g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \
} }
@ -1974,9 +1974,9 @@ type_name##_get_type (void) \
g_type_register_static_simple (TYPE_PARENT, \ g_type_register_static_simple (TYPE_PARENT, \
g_intern_static_string (#TypeName), \ g_intern_static_string (#TypeName), \
sizeof (TypeName##Class), \ sizeof (TypeName##Class), \
(GClassInitFunc) type_name##_class_intern_init, \ (GClassInitFunc)(void (*)(void)) type_name##_class_intern_init, \
sizeof (TypeName), \ sizeof (TypeName), \
(GInstanceInitFunc) type_name##_init, \ (GInstanceInitFunc)(void (*)(void)) type_name##_init, \
(GTypeFlags) flags); \ (GTypeFlags) flags); \
{ /* custom code follows */ { /* custom code follows */
#define _G_DEFINE_TYPE_EXTENDED_END() \ #define _G_DEFINE_TYPE_EXTENDED_END() \
@ -2008,7 +2008,7 @@ type_name##_get_type (void) \
g_type_register_static_simple (G_TYPE_INTERFACE, \ g_type_register_static_simple (G_TYPE_INTERFACE, \
g_intern_static_string (#TypeName), \ g_intern_static_string (#TypeName), \
sizeof (TypeName##Interface), \ sizeof (TypeName##Interface), \
(GClassInitFunc)type_name##_default_init, \ (GClassInitFunc)(GVoidFunc)type_name##_default_init, \
0, \ 0, \
(GInstanceInitFunc)NULL, \ (GInstanceInitFunc)NULL, \
(GTypeFlags) 0); \ (GTypeFlags) 0); \