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 | |
parent | b2d0cc5d52e0a6f824ea7a342c1c092aed67d65b (diff) | |
download | gdk-pixbuf-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
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | modules/input/imam-et.c | 18 | ||||
-rw-r--r-- | modules/input/imcedilla.c | 18 | ||||
-rw-r--r-- | modules/input/imcyrillic-translit.c | 18 | ||||
-rw-r--r-- | modules/input/imime.c | 16 | ||||
-rw-r--r-- | modules/input/iminuktitut.c | 18 | ||||
-rw-r--r-- | modules/input/imipa.c | 18 | ||||
-rw-r--r-- | modules/input/immultipress.c | 18 | ||||
-rw-r--r-- | modules/input/imthai.c | 18 | ||||
-rw-r--r-- | modules/input/imti-er.c | 18 | ||||
-rw-r--r-- | modules/input/imti-et.c | 18 | ||||
-rw-r--r-- | modules/input/imviqr.c | 18 | ||||
-rw-r--r-- | modules/input/imxim.c | 18 |
13 files changed, 90 insertions, 131 deletions
@@ -1,3 +1,10 @@ +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. + 2008-03-18 Sven Neumann <sven@gimp.org> * gtk/gtkmountoperation.c (gtk_mount_operation_ask_password): set diff --git a/modules/input/imam-et.c b/modules/input/imam-et.c index 8701d550b..5ba271e70 100644 --- a/modules/input/imam-et.c +++ b/modules/input/imam-et.c @@ -462,32 +462,28 @@ static const GtkIMContextInfo *info_list[] = { }; #ifndef INCLUDE_IM_am_et -#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_am_et_ ## function +#define MODULE_ENTRY(type, function) type _gtk_immodule_am_et_ ## function #endif -void -MODULE_ENTRY (init) (GTypeModule *module) +MODULE_ENTRY (void, init) (GTypeModule *module) { am_et_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, "am_et") == 0) return g_object_new (type_am_et_translit, NULL); diff --git a/modules/input/imcedilla.c b/modules/input/imcedilla.c index f3b0c9ff6..c74ba68f6 100644 --- a/modules/input/imcedilla.c +++ b/modules/input/imcedilla.c @@ -99,32 +99,28 @@ static const GtkIMContextInfo *info_list[] = { }; #ifndef INCLUDE_IM_cedilla -#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_cedilla_ ## function +#define MODULE_ENTRY(type, function) type _gtk_immodule_cedilla_ ## function #endif -void -MODULE_ENTRY (init) (GTypeModule *module) +MODULE_ENTRY (void, init) (GTypeModule *module) { cedilla_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, "cedilla") == 0) return g_object_new (type_cedilla, NULL); diff --git a/modules/input/imcyrillic-translit.c b/modules/input/imcyrillic-translit.c index c7c9a0370..cf7fdb595 100644 --- a/modules/input/imcyrillic-translit.c +++ b/modules/input/imcyrillic-translit.c @@ -225,32 +225,28 @@ static const GtkIMContextInfo *info_list[] = { }; #ifndef INCLUDE_IM_cyrillic_translit -#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_cyrillic_translit_ ## function +#define MODULE_ENTRY(type, function) type _gtk_immodule_cyrillic_translit_ ## function #endif -void -MODULE_ENTRY (init) (GTypeModule *module) +MODULE_ENTRY (void, init) (GTypeModule *module) { cyrillic_translit_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, "cyrillic_translit") == 0) return g_object_new (type_cyrillic_translit, NULL); diff --git a/modules/input/imime.c b/modules/input/imime.c index 843917cda..88b3cd1c3 100644 --- a/modules/input/imime.c +++ b/modules/input/imime.c @@ -40,31 +40,27 @@ static const GtkIMContextInfo *info_list[] = { }; #ifndef INCLUDE_IM_ime -#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_ime_ ## function +#define MODULE_ENTRY(type, function) type _gtk_immodule_ime_ ## function #endif -void -MODULE_ENTRY (init) (GTypeModule * module) +MODULE_ENTRY (void, init) (GTypeModule * module) { gtk_im_context_ime_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) { g_return_val_if_fail (context_id, NULL); diff --git a/modules/input/iminuktitut.c b/modules/input/iminuktitut.c index 86e97abbe..2311936f6 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); diff --git a/modules/input/imipa.c b/modules/input/imipa.c index 853b3663c..10d944dd5 100644 --- a/modules/input/imipa.c +++ b/modules/input/imipa.c @@ -153,32 +153,28 @@ static const GtkIMContextInfo *info_list[] = { }; #ifndef INCLUDE_IM_ipa -#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_ipa_ ## function +#define MODULE_ENTRY(type, function) type _gtk_immodule_ipa_ ## function #endif -void -MODULE_ENTRY (init) (GTypeModule *module) +MODULE_ENTRY (void, init) (GTypeModule *module) { ipa_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, "ipa") == 0) return g_object_new (type_ipa, NULL); diff --git a/modules/input/immultipress.c b/modules/input/immultipress.c index 6430eaabf..13049828d 100644 --- a/modules/input/immultipress.c +++ b/modules/input/immultipress.c @@ -39,32 +39,28 @@ static const GtkIMContextInfo *info_list[] = { }; #ifndef INCLUDE_IM_multipress -#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_multipress_ ## function +#define MODULE_ENTRY(type, function) type _gtk_immodule_multipress_ ## function #endif -void -MODULE_ENTRY (init) (GTypeModule *module) +MODULE_ENTRY (void, init) (GTypeModule *module) { gtk_im_context_multipress_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, CONTEXT_ID) == 0) { diff --git a/modules/input/imthai.c b/modules/input/imthai.c index 96b9f38b7..e26362010 100644 --- a/modules/input/imthai.c +++ b/modules/input/imthai.c @@ -43,32 +43,28 @@ static const GtkIMContextInfo *info_list[] = { }; #ifndef INCLUDE_IM_thai -#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_thai_ ## function +#define MODULE_ENTRY(type, function) type _gtk_immodule_thai_ ## function #endif -void -MODULE_ENTRY (init) (GTypeModule *module) +MODULE_ENTRY (void, init) (GTypeModule *module) { gtk_im_context_thai_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, "thai") == 0) return gtk_im_context_thai_new (); diff --git a/modules/input/imti-er.c b/modules/input/imti-er.c index 63d2cbb5d..c00350c7b 100644 --- a/modules/input/imti-er.c +++ b/modules/input/imti-er.c @@ -461,32 +461,28 @@ static const GtkIMContextInfo *info_list[] = { }; #ifndef INCLUDE_IM_ti_er -#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_ti_er_ ## function +#define MODULE_ENTRY(type, function) type _gtk_immodule_ti_er_ ## function #endif -void -MODULE_ENTRY (init) (GTypeModule *module) +MODULE_ENTRY (void, init) (GTypeModule *module) { ti_er_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, "ti_er") == 0) return g_object_new (type_ti_er_translit, NULL); diff --git a/modules/input/imti-et.c b/modules/input/imti-et.c index d438c1f13..b4bd2001c 100644 --- a/modules/input/imti-et.c +++ b/modules/input/imti-et.c @@ -461,32 +461,28 @@ static const GtkIMContextInfo *info_list[] = { }; #ifndef INCLUDE_IM_ti_et -#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_ti_et_ ## function +#define MODULE_ENTRY(type, function) type _gtk_immodule_ti_et_ ## function #endif -void -MODULE_ENTRY (init) (GTypeModule *module) +MODULE_ENTRY (void, init) (GTypeModule *module) { ti_et_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, "ti_et") == 0) return g_object_new (type_ti_et_translit, NULL); diff --git a/modules/input/imviqr.c b/modules/input/imviqr.c index ef072e51b..20f4d99db 100644 --- a/modules/input/imviqr.c +++ b/modules/input/imviqr.c @@ -252,32 +252,28 @@ static const GtkIMContextInfo *info_list[] = { }; #ifndef INCLUDE_IM_viqr -#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_viqr_ ## function +#define MODULE_ENTRY(type, function) type _gtk_immodule_viqr_ ## function #endif -void -MODULE_ENTRY (init) (GTypeModule *module) +MODULE_ENTRY (void, init) (GTypeModule *module) { viqr_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, "viqr") == 0) return g_object_new (type_viqr_translit, NULL); diff --git a/modules/input/imxim.c b/modules/input/imxim.c index d41257609..eae380580 100644 --- a/modules/input/imxim.c +++ b/modules/input/imxim.c @@ -36,33 +36,29 @@ static const GtkIMContextInfo *info_list[] = { }; #ifndef INCLUDE_IM_xim -#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_xim_ ## function +#define MODULE_ENTRY(type, function) type _gtk_immodule_xim_ ## function #endif -void -MODULE_ENTRY (init) (GTypeModule *type_module) +MODULE_ENTRY (void, init) (GTypeModule *type_module) { gtk_im_context_xim_register_type (type_module); } -void -MODULE_ENTRY (exit) (void) +MODULE_ENTRY (void, exit) (void) { gtk_im_context_xim_shutdown (); } -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, "xim") == 0) return gtk_im_context_xim_new (); |