Fix some problems with my last commit

This commit is contained in:
Matthias Clasen 2006-04-23 04:21:08 +00:00
parent 6a79964f18
commit 68eaeb69cb
4 changed files with 13 additions and 4 deletions

View File

@ -1,3 +1,12 @@
2006-04-23 Matthias Clasen <mclasen@redhat.com>
* gobject.symbols: Fix a typo.
* gtype.c: (g_type_register_static_simple): Add a
missing return.
* gtype.h: Silence warnings from G_DEFINE_TYPE.
2006-04-21 Matthias Clasen <mclasen@redhat.com> 2006-04-21 Matthias Clasen <mclasen@redhat.com>
* gobject.symbols: * gobject.symbols:

View File

@ -16,7 +16,6 @@
g_boxed_copy g_boxed_copy
g_boxed_free g_boxed_free
g_boxed_type_register_static g_boxed_type_register_static
g_boxed_type_register_static_simple
g_date_get_type G_GNUC_CONST g_date_get_type G_GNUC_CONST
g_gstring_get_type G_GNUC_CONST g_gstring_get_type G_GNUC_CONST
g_strv_get_type G_GNUC_CONST g_strv_get_type G_GNUC_CONST
@ -365,6 +364,7 @@ g_type_query
g_type_register_dynamic g_type_register_dynamic
g_type_register_fundamental g_type_register_fundamental
g_type_register_static g_type_register_static
g_type_register_static_simple
g_type_remove_class_cache_func g_type_remove_class_cache_func
g_type_remove_interface_check g_type_remove_interface_check
g_type_set_qdata g_type_set_qdata

View File

@ -2225,7 +2225,7 @@ g_type_register_static_simple (GType parent_type,
info.instance_init = instance_init; info.instance_init = instance_init;
info.value_table = NULL; info.value_table = NULL;
g_type_register_static (parent_type, type_name, &info, flags); return g_type_register_static (parent_type, type_name, &info, flags);
} }
GType GType

View File

@ -374,9 +374,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), \
type_name##_class_intern_init, \ (GClassInitFunc)type_name##_class_intern_init, \
sizeof (TypeName), \ sizeof (TypeName), \
type_name##_init, \ (GInstanceInitFunc)type_name##_init, \
(GTypeFlags) flags); \ (GTypeFlags) flags); \
{ CODE ; } \ { CODE ; } \
} \ } \