AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 523225 - modules/input/im*.c: MODULE_ENTRY macros make illegal code

Browse Source 
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
This commit is contained in:
Tor Lillqvist 2008-03-18 21:29:00 +00:00 committed by Tor Lillqvist
parent b2d0cc5d52
commit 2dce0b35a5
13 changed files with 90 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2008-03-18 Sven Neumann <sven@gimp.org>
* gtk/gtkmountoperation.c (gtk_mount_operation_ask_password): set * gtk/gtkmountoperation.c (gtk_mount_operation_ask_password): set

18
modules/input/imam-et.c
View File

@ -462,32 +462,28 @@ static const GtkIMContextInfo *info_list[] = {
}; };
#ifndef INCLUDE_IM_am_et #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 #else
#define MODULE_ENTRY(function) _gtk_immodule_am_et_ ## function #define MODULE_ENTRY(type, function) type _gtk_immodule_am_et_ ## function
#endif #endif
void MODULE_ENTRY (void, init) (GTypeModule *module)
MODULE_ENTRY (init) (GTypeModule *module)
{ {
am_et_register_type (module); am_et_register_type (module);
} }
void MODULE_ENTRY (void, exit) (void)
MODULE_ENTRY (exit) (void)
{ {
} }
void MODULE_ENTRY (void, list) (const GtkIMContextInfo ***contexts,
MODULE_ENTRY (list) (const GtkIMContextInfo ***contexts, int *n_contexts)
int *n_contexts)
{ {
*contexts = info_list; *contexts = info_list;
*n_contexts = G_N_ELEMENTS (info_list); *n_contexts = G_N_ELEMENTS (info_list);
} }
GtkIMContext * MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id)
MODULE_ENTRY (create) (const gchar *context_id)
{ {
if (strcmp (context_id, "am_et") == 0) if (strcmp (context_id, "am_et") == 0)
return g_object_new (type_am_et_translit, NULL); return g_object_new (type_am_et_translit, NULL);

18
modules/input/imcedilla.c
View File

@ -99,32 +99,28 @@ static const GtkIMContextInfo *info_list[] = {
}; };
#ifndef INCLUDE_IM_cedilla #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 #else
#define MODULE_ENTRY(function) _gtk_immodule_cedilla_ ## function #define MODULE_ENTRY(type, function) type _gtk_immodule_cedilla_ ## function
#endif #endif
void MODULE_ENTRY (void, init) (GTypeModule *module)
MODULE_ENTRY (init) (GTypeModule *module)
{ {
cedilla_register_type (module); cedilla_register_type (module);
} }
void MODULE_ENTRY (void, exit) (void)
MODULE_ENTRY (exit) (void)
{ {
} }
void MODULE_ENTRY (void, list) (const GtkIMContextInfo ***contexts,
MODULE_ENTRY (list) (const GtkIMContextInfo ***contexts, int *n_contexts)
int *n_contexts)
{ {
*contexts = info_list; *contexts = info_list;
*n_contexts = G_N_ELEMENTS (info_list); *n_contexts = G_N_ELEMENTS (info_list);
} }
GtkIMContext * MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id)
MODULE_ENTRY (create) (const gchar *context_id)
{ {
if (strcmp (context_id, "cedilla") == 0) if (strcmp (context_id, "cedilla") == 0)
return g_object_new (type_cedilla, NULL); return g_object_new (type_cedilla, NULL);

18
modules/input/imcyrillic-translit.c
View File

@ -225,32 +225,28 @@ static const GtkIMContextInfo *info_list[] = {
}; };
#ifndef INCLUDE_IM_cyrillic_translit #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 #else
#define MODULE_ENTRY(function) _gtk_immodule_cyrillic_translit_ ## function #define MODULE_ENTRY(type, function) type _gtk_immodule_cyrillic_translit_ ## function
#endif #endif
void MODULE_ENTRY (void, init) (GTypeModule *module)
MODULE_ENTRY (init) (GTypeModule *module)
{ {
cyrillic_translit_register_type (module); cyrillic_translit_register_type (module);
} }
void MODULE_ENTRY (void, exit) (void)
MODULE_ENTRY (exit) (void)
{ {
} }
void MODULE_ENTRY (void, list) (const GtkIMContextInfo ***contexts,
MODULE_ENTRY (list) (const GtkIMContextInfo ***contexts, int *n_contexts)
int *n_contexts)
{ {
*contexts = info_list; *contexts = info_list;
*n_contexts = G_N_ELEMENTS (info_list); *n_contexts = G_N_ELEMENTS (info_list);
} }
GtkIMContext * MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id)
MODULE_ENTRY (create) (const gchar *context_id)
{ {
if (strcmp (context_id, "cyrillic_translit") == 0) if (strcmp (context_id, "cyrillic_translit") == 0)
return g_object_new (type_cyrillic_translit, NULL); return g_object_new (type_cyrillic_translit, NULL);

16
modules/input/imime.c
View File

@ -40,31 +40,27 @@ static const GtkIMContextInfo *info_list[] = {
}; };
#ifndef INCLUDE_IM_ime #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 #else
#define MODULE_ENTRY(function) _gtk_immodule_ime_ ## function #define MODULE_ENTRY(type, function) type _gtk_immodule_ime_ ## function
#endif #endif
void MODULE_ENTRY (void, init) (GTypeModule * module)
MODULE_ENTRY (init) (GTypeModule * module)
{ {
gtk_im_context_ime_register_type (module); gtk_im_context_ime_register_type (module);
} }
void MODULE_ENTRY (void, exit) (void)
MODULE_ENTRY (exit) (void)
{ {
} }
void MODULE_ENTRY (void, list) (const GtkIMContextInfo *** contexts, int *n_contexts)
MODULE_ENTRY (list) (const GtkIMContextInfo *** contexts, int *n_contexts)
{ {
*contexts = info_list; *contexts = info_list;
*n_contexts = G_N_ELEMENTS (info_list); *n_contexts = G_N_ELEMENTS (info_list);
} }
GtkIMContext * MODULE_ENTRY (GtkIMContext *, create) (const gchar * context_id)
MODULE_ENTRY (create) (const gchar * context_id)
{ {
g_return_val_if_fail (context_id, NULL); g_return_val_if_fail (context_id, NULL);

18
modules/input/iminuktitut.c
View File

@ -135,32 +135,28 @@ static const GtkIMContextInfo *info_list[] = {
}; };
#ifndef INCLUDE_IM_inuktitut #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 #else
#define MODULE_ENTRY(function) _gtk_immodule_inuktitut_ ## function #define MODULE_ENTRY(type, function) type _gtk_immodule_inuktitut_ ## function
#endif #endif
void MODULE_ENTRY (void, init) (GTypeModule *module)
MODULE_ENTRY (init) (GTypeModule *module)
{ {
inuktitut_register_type (module); inuktitut_register_type (module);
} }
void MODULE_ENTRY (void, exit) (void)
MODULE_ENTRY (exit) (void)
{ {
} }
void MODULE_ENTRY (void, list) (const GtkIMContextInfo ***contexts,
MODULE_ENTRY (list) (const GtkIMContextInfo ***contexts, int *n_contexts)
int *n_contexts)
{ {
*contexts = info_list; *contexts = info_list;
*n_contexts = G_N_ELEMENTS (info_list); *n_contexts = G_N_ELEMENTS (info_list);
} }
GtkIMContext * MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id)
MODULE_ENTRY (create) (const gchar *context_id)
{ {
if (strcmp (context_id, "inuktitut") == 0) if (strcmp (context_id, "inuktitut") == 0)
return g_object_new (type_inuktitut_translit, NULL); return g_object_new (type_inuktitut_translit, NULL);

18
modules/input/imipa.c
View File

@ -153,32 +153,28 @@ static const GtkIMContextInfo *info_list[] = {
}; };
#ifndef INCLUDE_IM_ipa #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 #else
#define MODULE_ENTRY(function) _gtk_immodule_ipa_ ## function #define MODULE_ENTRY(type, function) type _gtk_immodule_ipa_ ## function
#endif #endif
void MODULE_ENTRY (void, init) (GTypeModule *module)
MODULE_ENTRY (init) (GTypeModule *module)
{ {
ipa_register_type (module); ipa_register_type (module);
} }
void MODULE_ENTRY (void, exit) (void)
MODULE_ENTRY (exit) (void)
{ {
} }
void MODULE_ENTRY (void, list) (const GtkIMContextInfo ***contexts,
MODULE_ENTRY (list) (const GtkIMContextInfo ***contexts, int *n_contexts)
int *n_contexts)
{ {
*contexts = info_list; *contexts = info_list;
*n_contexts = G_N_ELEMENTS (info_list); *n_contexts = G_N_ELEMENTS (info_list);
} }
GtkIMContext * MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id)
MODULE_ENTRY (create) (const gchar *context_id)
{ {
if (strcmp (context_id, "ipa") == 0) if (strcmp (context_id, "ipa") == 0)
return g_object_new (type_ipa, NULL); return g_object_new (type_ipa, NULL);

18
modules/input/immultipress.c
View File

@ -39,32 +39,28 @@ static const GtkIMContextInfo *info_list[] = {
}; };
#ifndef INCLUDE_IM_multipress #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 #else
#define MODULE_ENTRY(function) _gtk_immodule_multipress_ ## function #define MODULE_ENTRY(type, function) type _gtk_immodule_multipress_ ## function
#endif #endif
void MODULE_ENTRY (void, init) (GTypeModule *module)
MODULE_ENTRY (init) (GTypeModule *module)
{ {
gtk_im_context_multipress_register_type(module); gtk_im_context_multipress_register_type(module);
} }
void MODULE_ENTRY (void, exit) (void)
MODULE_ENTRY (exit) (void)
{ {
} }
void MODULE_ENTRY (void, list) (const GtkIMContextInfo ***contexts,
MODULE_ENTRY (list) (const GtkIMContextInfo ***contexts, int *n_contexts)
int *n_contexts)
{ {
*contexts = info_list; *contexts = info_list;
*n_contexts = G_N_ELEMENTS (info_list); *n_contexts = G_N_ELEMENTS (info_list);
} }
GtkIMContext * MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id)
MODULE_ENTRY (create) (const gchar *context_id)
{ {
if (strcmp (context_id, CONTEXT_ID) == 0) if (strcmp (context_id, CONTEXT_ID) == 0)
{ {

18
modules/input/imthai.c
View File

@ -43,32 +43,28 @@ static const GtkIMContextInfo *info_list[] = {
}; };
#ifndef INCLUDE_IM_thai #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 #else
#define MODULE_ENTRY(function) _gtk_immodule_thai_ ## function #define MODULE_ENTRY(type, function) type _gtk_immodule_thai_ ## function
#endif #endif
void MODULE_ENTRY (void, init) (GTypeModule *module)
MODULE_ENTRY (init) (GTypeModule *module)
{ {
gtk_im_context_thai_register_type (module); gtk_im_context_thai_register_type (module);
} }
void MODULE_ENTRY (void, exit) (void)
MODULE_ENTRY (exit) (void)
{ {
} }
void MODULE_ENTRY (void, list) (const GtkIMContextInfo ***contexts,
MODULE_ENTRY (list) (const GtkIMContextInfo ***contexts, int *n_contexts)
int *n_contexts)
{ {
*contexts = info_list; *contexts = info_list;
*n_contexts = G_N_ELEMENTS (info_list); *n_contexts = G_N_ELEMENTS (info_list);
} }
GtkIMContext * MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id)
MODULE_ENTRY (create) (const gchar *context_id)
{ {
if (strcmp (context_id, "thai") == 0) if (strcmp (context_id, "thai") == 0)
return gtk_im_context_thai_new (); return gtk_im_context_thai_new ();

18
modules/input/imti-er.c
View File

@ -461,32 +461,28 @@ static const GtkIMContextInfo *info_list[] = {
}; };
#ifndef INCLUDE_IM_ti_er #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 #else
#define MODULE_ENTRY(function) _gtk_immodule_ti_er_ ## function #define MODULE_ENTRY(type, function) type _gtk_immodule_ti_er_ ## function
#endif #endif
void MODULE_ENTRY (void, init) (GTypeModule *module)
MODULE_ENTRY (init) (GTypeModule *module)
{ {
ti_er_register_type (module); ti_er_register_type (module);
} }
void MODULE_ENTRY (void, exit) (void)
MODULE_ENTRY (exit) (void)
{ {
} }
void MODULE_ENTRY (void, list) (const GtkIMContextInfo ***contexts,
MODULE_ENTRY (list) (const GtkIMContextInfo ***contexts, int *n_contexts)
int *n_contexts)
{ {
*contexts = info_list; *contexts = info_list;
*n_contexts = G_N_ELEMENTS (info_list); *n_contexts = G_N_ELEMENTS (info_list);
} }
GtkIMContext * MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id)
MODULE_ENTRY (create) (const gchar *context_id)
{ {
if (strcmp (context_id, "ti_er") == 0) if (strcmp (context_id, "ti_er") == 0)
return g_object_new (type_ti_er_translit, NULL); return g_object_new (type_ti_er_translit, NULL);

18
modules/input/imti-et.c
View File

@ -461,32 +461,28 @@ static const GtkIMContextInfo *info_list[] = {
}; };
#ifndef INCLUDE_IM_ti_et #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 #else
#define MODULE_ENTRY(function) _gtk_immodule_ti_et_ ## function #define MODULE_ENTRY(type, function) type _gtk_immodule_ti_et_ ## function
#endif #endif
void MODULE_ENTRY (void, init) (GTypeModule *module)
MODULE_ENTRY (init) (GTypeModule *module)
{ {
ti_et_register_type (module); ti_et_register_type (module);
} }
void MODULE_ENTRY (void, exit) (void)
MODULE_ENTRY (exit) (void)
{ {
} }
void MODULE_ENTRY (void, list) (const GtkIMContextInfo ***contexts,
MODULE_ENTRY (list) (const GtkIMContextInfo ***contexts, int *n_contexts)
int *n_contexts)
{ {
*contexts = info_list; *contexts = info_list;
*n_contexts = G_N_ELEMENTS (info_list); *n_contexts = G_N_ELEMENTS (info_list);
} }
GtkIMContext * MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id)
MODULE_ENTRY (create) (const gchar *context_id)
{ {
if (strcmp (context_id, "ti_et") == 0) if (strcmp (context_id, "ti_et") == 0)
return g_object_new (type_ti_et_translit, NULL); return g_object_new (type_ti_et_translit, NULL);

18
modules/input/imviqr.c
View File

@ -252,32 +252,28 @@ static const GtkIMContextInfo *info_list[] = {
}; };
#ifndef INCLUDE_IM_viqr #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 #else
#define MODULE_ENTRY(function) _gtk_immodule_viqr_ ## function #define MODULE_ENTRY(type, function) type _gtk_immodule_viqr_ ## function
#endif #endif
void MODULE_ENTRY (void, init) (GTypeModule *module)
MODULE_ENTRY (init) (GTypeModule *module)
{ {
viqr_register_type (module); viqr_register_type (module);
} }
void MODULE_ENTRY (void, exit) (void)
MODULE_ENTRY (exit) (void)
{ {
} }
void MODULE_ENTRY (void, list) (const GtkIMContextInfo ***contexts,
MODULE_ENTRY (list) (const GtkIMContextInfo ***contexts, int *n_contexts)
int *n_contexts)
{ {
*contexts = info_list; *contexts = info_list;
*n_contexts = G_N_ELEMENTS (info_list); *n_contexts = G_N_ELEMENTS (info_list);
} }
GtkIMContext * MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id)
MODULE_ENTRY (create) (const gchar *context_id)
{ {
if (strcmp (context_id, "viqr") == 0) if (strcmp (context_id, "viqr") == 0)
return g_object_new (type_viqr_translit, NULL); return g_object_new (type_viqr_translit, NULL);

18
modules/input/imxim.c
View File

@ -36,33 +36,29 @@ static const GtkIMContextInfo *info_list[] = {
}; };
#ifndef INCLUDE_IM_xim #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 #else
#define MODULE_ENTRY(function) _gtk_immodule_xim_ ## function #define MODULE_ENTRY(type, function) type _gtk_immodule_xim_ ## function
#endif #endif
void MODULE_ENTRY (void, init) (GTypeModule *type_module)
MODULE_ENTRY (init) (GTypeModule *type_module)
{ {
gtk_im_context_xim_register_type (type_module); gtk_im_context_xim_register_type (type_module);
} }
void MODULE_ENTRY (void, exit) (void)
MODULE_ENTRY (exit) (void)
{ {
gtk_im_context_xim_shutdown (); gtk_im_context_xim_shutdown ();
} }
void MODULE_ENTRY (void, list) (const GtkIMContextInfo ***contexts,
MODULE_ENTRY (list) (const GtkIMContextInfo ***contexts, int *n_contexts)
int *n_contexts)
{ {
*contexts = info_list; *contexts = info_list;
*n_contexts = G_N_ELEMENTS (info_list); *n_contexts = G_N_ELEMENTS (info_list);
} }
GtkIMContext * MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id)
MODULE_ENTRY (create) (const gchar *context_id)
{ {
if (strcmp (context_id, "xim") == 0) if (strcmp (context_id, "xim") == 0)
return gtk_im_context_xim_new (); return gtk_im_context_xim_new ();