Merge branch 'backport-555-gtype-bool-cxx-glib-2-58' into 'glib-2-58'

Backport Suppress -Wint-in-bool-context warning with G_DEFINE_INTERFACE and g++ to glib-2-58

See merge request GNOME/glib!558
This commit is contained in:
Simon McVittie 2019-01-04 14:17:07 +00:00
commit 16d9a873ba

View File

@ -2023,7 +2023,7 @@ type_name##_get_type (void) \
0, \
(GInstanceInitFunc)NULL, \
(GTypeFlags) 0); \
if (TYPE_PREREQ) \
if (TYPE_PREREQ != G_TYPE_INVALID) \
g_type_interface_add_prerequisite (g_define_type_id, TYPE_PREREQ); \
{ /* custom code follows */
#define _G_DEFINE_INTERFACE_EXTENDED_END() \