From a41b04a301a7ec7173b64d947469fc2ecef61e7a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 6 Jul 2004 14:13:24 +0000 Subject: [PATCH] Fix the declarations of the new functions to return GType, not void. Also Tue Jul 6 00:46:43 2004 Matthias Clasen * gtypemodule.h: * gtypemodule.c: Fix the declarations of the new functions to return GType, not void. Also add missing includes. (#145508, Morten Welinder) --- gobject/ChangeLog | 7 +++++++ gobject/gtypemodule.c | 4 ++-- gobject/gtypemodule.h | 5 +++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 5d912c4..fbc3b66 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,6 +1,13 @@ Tue Jul 6 00:46:43 2004 Matthias Clasen * gtypemodule.h: + * gtypemodule.c: Fix the declarations of the new + functions to return GType, not void. + Also add missing includes. (#145508, Morten Welinder) + +Tue Jul 6 00:46:43 2004 Matthias Clasen + + * gtypemodule.h: * gtypemodule.c (g_type_module_register_flags): * gtypemodule.c (g_type_module_register_enum): New functions to register enum and flags types from a diff --git a/gobject/gtypemodule.c b/gobject/gtypemodule.c index bb3df5b..0c917c0 100644 --- a/gobject/gtypemodule.c +++ b/gobject/gtypemodule.c @@ -388,7 +388,7 @@ g_type_module_add_interface (GTypeModule *module, module_interface_info->info = *interface_info; } -void +GType g_type_module_register_enum (GTypeModule *module, const gchar *name, const GEnumValue *const_static_values) @@ -406,7 +406,7 @@ g_type_module_register_enum (GTypeModule *module, G_TYPE_ENUM, name, &enum_type_info, 0); } -void +GType g_type_module_register_flags (GTypeModule *module, const gchar *name, const GFlagsValue *const_static_values) diff --git a/gobject/gtypemodule.h b/gobject/gtypemodule.h index 863ea15..ad2c642 100644 --- a/gobject/gtypemodule.h +++ b/gobject/gtypemodule.h @@ -24,6 +24,7 @@ #define __G_TYPE_MODULE_H__ #include +#include G_BEGIN_DECLS @@ -79,10 +80,10 @@ void g_type_module_add_interface (GTypeModule *module, GType instance_type, GType interface_type, const GInterfaceInfo *interface_info); -void g_type_module_register_enum (GTypeModule *module, +GType g_type_module_register_enum (GTypeModule *module, const gchar *name, const GEnumValue *const_static_values); -void g_type_module_register_flags (GTypeModule *module, +GType g_type_module_register_flags (GTypeModule *module, const gchar *name, const GFlagsValue *const_static_values); -- 2.7.4