callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/input/iminuktitut.c
View File

@ -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);