Merge branch 'correct-gtype-macro-comment' into 'main'

gobject: Fix macro name in comment; improve style

See merge request GNOME/glib!4138
This commit is contained in:
Philip Withnall 2024-07-03 10:43:18 +00:00
commit 5de4d59c31

View File

@ -2330,12 +2330,12 @@ type_name##_get_type_once (void) \
return g_define_type_id; \ return g_define_type_id; \
} /* closes type_name##_get_type_once() */ } /* closes type_name##_get_type_once() */
/* This was defined before we had G_DEFINE_TYPE_WITH_CODE_AND_PRELUDE, it's simplest /* This was defined before we had _G_DEFINE_TYPE_EXTENDED_WITH_PRELUDE in
* to keep it. * gtype-private.h, it's simplest to keep it.
*/ */
#define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \ #define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \
_G_DEFINE_TYPE_EXTENDED_BEGIN_PRE(TypeName, type_name) \ _G_DEFINE_TYPE_EXTENDED_BEGIN_PRE (TypeName, type_name) \
_G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER(TypeName, type_name, TYPE_PARENT, flags) \ _G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER (TypeName, type_name, TYPE_PARENT, flags)
/* Intentionally using (GTypeFlags) 0 instead of G_TYPE_FLAG_NONE here, /* Intentionally using (GTypeFlags) 0 instead of G_TYPE_FLAG_NONE here,
* to avoid deprecation warnings with older GLIB_VERSION_MAX_ALLOWED */ * to avoid deprecation warnings with older GLIB_VERSION_MAX_ALLOWED */