diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-03-18 21:29:00 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-03-18 21:29:00 +0000 |
| commit | 2dce0b35a533dcfff3283ae1748ad5605ca6ba76 (patch) | |
| tree | 2621e6b7aca15b7dc36641176029c4341d322e21 /modules/input/iminuktitut.c | |
| parent | b2d0cc5d52e0a6f824ea7a342c1c092aed67d65b (diff) | |
| download | gtk+-2dce0b35a533dcfff3283ae1748ad5605ca6ba76.tar.gz | |
Bug 523225 - modules/input/im*.c: MODULE_ENTRY macros make illegal code
2008-03-18 Tor Lillqvist <tml@novell.com>
Bug 523225 - modules/input/im*.c: MODULE_ENTRY macros make illegal code
* modules/input/im*.c: Modify the MODULE_ENTRY macro so the
G_MODULE_ENTRY decoration can be put in a more correct place.
svn path=/trunk/; revision=19902
Diffstat (limited to 'modules/input/iminuktitut.c')
| -rw-r--r-- | modules/input/iminuktitut.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/modules/input/iminuktitut.c b/modules/input/iminuktitut.c index 86e97abbe1..2311936f63 100644 --- a/modules/input/iminuktitut.c +++ b/modules/input/iminuktitut.c @@ -135,32 +135,28 @@ static const GtkIMContextInfo *info_list[] = { }; #ifndef INCLUDE_IM_inuktitut -#define MODULE_ENTRY(function) G_MODULE_EXPORT im_module_ ## function +#define MODULE_ENTRY(type, function) G_MODULE_EXPORT type im_module_ ## function #else -#define MODULE_ENTRY(function) _gtk_immodule_inuktitut_ ## function +#define MODULE_ENTRY(type, function) type _gtk_immodule_inuktitut_ ## function #endif -void -MODULE_ENTRY (init) (GTypeModule *module) +MODULE_ENTRY (void, init) (GTypeModule *module) { inuktitut_register_type (module); } -void -MODULE_ENTRY (exit) (void) +MODULE_ENTRY (void, exit) (void) { } -void -MODULE_ENTRY (list) (const GtkIMContextInfo ***contexts, - int *n_contexts) +MODULE_ENTRY (void, list) (const GtkIMContextInfo ***contexts, + int *n_contexts) { *contexts = info_list; *n_contexts = G_N_ELEMENTS (info_list); } -GtkIMContext * -MODULE_ENTRY (create) (const gchar *context_id) +MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id) { if (strcmp (context_id, "inuktitut") == 0) return g_object_new (type_inuktitut_translit, NULL); |