Use explicit G_MODULE_EXPORT decoration when building the loader in

2008-05-27  Tor Lillqvist  <tml@novell.com>

	* io-*.c: Use explicit G_MODULE_EXPORT decoration when building
	the loader in question as a module.

	* gdk-pixbuf-io.c: Enable included build of the icns and jasper
	loaders.


svn path=/trunk/; revision=20192

18 files changed, 88 insertions, 94 deletions

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index b320f2996..aeccae0bc 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -43,7 +43,7 @@ install-ms-lib:
 uninstall-ms-lib:
 endif
 
-# This places the generated .def in srcdir, since it is expected to be there.
+# This places the generated .def file in srcdir, since it is expected to be there.
 # (The one from a tarball is)
 gdk_pixbuf.def: gdk-pixbuf.symbols
 	(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk_pixbuf.def
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 5a6f59850..62c676ff5 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -363,6 +363,12 @@ gdk_pixbuf_io_init (void)
 #ifdef INCLUDE_pcx
 	load_one_builtin_module (pcx);
 #endif
+#ifdef INCLUDE_icns
+	load_one_builtin_module (icns);
+#endif
+#ifdef INCLUDE_jasper
+	load_one_builtin_module (jasper);
+#endif
 #ifdef INCLUDE_gdiplus
 	/* We don't bother having the GDI+ loaders individually selectable
 	 * for building in or not.
@@ -592,6 +598,8 @@ module (wbmp);
 module (xbm);
 module (tga);
 module (pcx);
+module (icns);
+module (jasper);
 module (gdip_ico);
 module (gdip_wmf);
 module (gdip_emf);
@@ -660,6 +668,12 @@ _gdk_pixbuf_load_module (GdkPixbufModule *image_module,
 #ifdef INCLUDE_pcx
 	try_module (pcx,pcx);
 #endif
+#ifdef INCLUDE_icns
+	try_module (icns,icns);
+#endif
+#ifdef INCLUDE_jasper
+	try_module (jasper,jasper);
+#endif
 #ifdef INCLUDE_gdiplus
 	try_module (ico,gdip_ico);
 	try_module (wmf,gdip_wmf);
diff --git a/gdk-pixbuf/io-ani.c b/gdk-pixbuf/io-ani.c
index 65e560b8b..1ed68bd06 100644
--- a/gdk-pixbuf/io-ani.c
+++ b/gdk-pixbuf/io-ani.c
@@ -678,13 +678,12 @@ gdk_pixbuf__ani_image_load_animation (FILE *f, GError **error)
 }
 
 #ifndef INCLUDE_ani
-#define MODULE_ENTRY(type,function) function
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
-#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#define MODULE_ENTRY(function) void _gdk_pixbuf__ani_ ## function
 #endif
 
-void
-MODULE_ENTRY (ani, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
         module->load_animation = gdk_pixbuf__ani_image_load_animation;
         module->begin_load = gdk_pixbuf__ani_image_begin_load;
@@ -692,8 +691,7 @@ MODULE_ENTRY (ani, fill_vtable) (GdkPixbufModule *module)
         module->load_increment = gdk_pixbuf__ani_image_load_increment;
 }
 
-void
-MODULE_ENTRY (ani, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
 	static GdkPixbufModulePattern signature[] = {
 		{ "RIFF    ACON", "    xxxx    ", 100 },
diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c
index 278c1ba99..33368c044 100644
--- a/gdk-pixbuf/io-bmp.c
+++ b/gdk-pixbuf/io-bmp.c
@@ -1387,13 +1387,12 @@ gdk_pixbuf__bmp_image_save (FILE          *f,
 }
 
 #ifndef INCLUDE_bmp
-#define MODULE_ENTRY(type,function) function
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
-#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#define MODULE_ENTRY(function) void _gdk_pixbuf__bmp_ ## function
 #endif
 
-void
-MODULE_ENTRY (bmp, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
 	module->begin_load = gdk_pixbuf__bmp_image_begin_load;
 	module->stop_load = gdk_pixbuf__bmp_image_stop_load;
@@ -1402,8 +1401,7 @@ MODULE_ENTRY (bmp, fill_vtable) (GdkPixbufModule *module)
 	module->save_to_callback = gdk_pixbuf__bmp_image_save_to_callback;
 }
 
-void
-MODULE_ENTRY (bmp, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
 	static GdkPixbufModulePattern signature[] = {
 		{ "BM", NULL, 100 },
diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c
index 491f9cdc8..6a3cfa011 100644
--- a/gdk-pixbuf/io-gif.c
+++ b/gdk-pixbuf/io-gif.c
@@ -1655,13 +1655,12 @@ gdk_pixbuf__gif_image_load_animation (FILE *file,
 }
 
 #ifndef INCLUDE_gif
-#define MODULE_ENTRY(type,function) function
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
-#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#define MODULE_ENTRY(function) void _gdk_pixbuf__gif_ ## function
 #endif
 
-void
-MODULE_ENTRY (gif, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
         module->load = gdk_pixbuf__gif_image_load;
         module->begin_load = gdk_pixbuf__gif_image_begin_load;
@@ -1670,8 +1669,7 @@ MODULE_ENTRY (gif, fill_vtable) (GdkPixbufModule *module)
         module->load_animation = gdk_pixbuf__gif_image_load_animation;
 }
 
-void
-MODULE_ENTRY (gif, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
         static GdkPixbufModulePattern signature[] = {
                 { "GIF8", NULL, 100 },
diff --git a/gdk-pixbuf/io-icns.c b/gdk-pixbuf/io-icns.c
index 62a852334..fb043d6bc 100644
--- a/gdk-pixbuf/io-icns.c
+++ b/gdk-pixbuf/io-icns.c
@@ -364,14 +364,18 @@ icns_image_load (FILE *f, GError ** error)
   return pixbuf;
 }
 
-void
-fill_vtable (GdkPixbufModule * module)
+#ifndef INCLUDE_png
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
+#else
+#define MODULE_ENTRY(function) void _gdk_pixbuf__icns_ ## function
+#endif
+
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule * module)
 {
   module->load = icns_image_load;
 }
 
-void
-fill_info (GdkPixbufFormat * info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat * info)
 {
   static GdkPixbufModulePattern signature[] = {
     {"icns", NULL, 100},	/* file begins with 'icns' */
diff --git a/gdk-pixbuf/io-ico.c b/gdk-pixbuf/io-ico.c
index f25ecec3d..1fe1eff84 100644
--- a/gdk-pixbuf/io-ico.c
+++ b/gdk-pixbuf/io-ico.c
@@ -1184,14 +1184,13 @@ gdk_pixbuf__ico_image_save (FILE          *f,
 	return TRUE;
 }
 
-#ifndef INCLUDE_ico
-#define MODULE_ENTRY(type,function) function
+#ifndef INCLUDE_png
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
-#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#define MODULE_ENTRY(function) void _gdk_pixbuf__ico_ ## function
 #endif
 
-void
-MODULE_ENTRY (ico, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
 	module->begin_load = gdk_pixbuf__ico_image_begin_load;
 	module->stop_load = gdk_pixbuf__ico_image_stop_load;
@@ -1199,8 +1198,7 @@ MODULE_ENTRY (ico, fill_vtable) (GdkPixbufModule *module)
         module->save = gdk_pixbuf__ico_image_save;
 }
 
-void
-MODULE_ENTRY (ico, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
 	static GdkPixbufModulePattern signature[] = {
 		{ "  \x1   ", "zz znz", 100 }, 
diff --git a/gdk-pixbuf/io-jasper.c b/gdk-pixbuf/io-jasper.c
index 5194ebd00..c6f9bc294 100644
--- a/gdk-pixbuf/io-jasper.c
+++ b/gdk-pixbuf/io-jasper.c
@@ -262,16 +262,20 @@ jasper_image_load_increment (gpointer data, const guchar *buf, guint size, GErro
 	return TRUE;
 }
 
-void
-fill_vtable (GdkPixbufModule * module)
+#ifndef INCLUDE_png
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
+#else
+#define MODULE_ENTRY(function) void _gdk_pixbuf__jasper_ ## function
+#endif
+
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule * module)
 {
 	module->begin_load = jasper_image_begin_load;
 	module->stop_load = jasper_image_stop_load;
 	module->load_increment = jasper_image_load_increment;
 }
 
-void
-fill_info (GdkPixbufFormat * info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat * info)
 {
 	static GdkPixbufModulePattern signature[] = {
 		{ "    jP", "!!!!  ", 100 },		/* file begins with 'jP' at offset 4 */
diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index 7df7e1cd5..2e25871f0 100644
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -1272,13 +1272,12 @@ gdk_pixbuf__jpeg_image_save_to_callback (GdkPixbufSaveFunc   save_func,
 }
 
 #ifndef INCLUDE_jpeg
-#define MODULE_ENTRY(type,function) function
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
-#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#define MODULE_ENTRY(function) void _gdk_pixbuf__jpeg_ ## function
 #endif
 
-void
-MODULE_ENTRY (jpeg, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
 	module->load = gdk_pixbuf__jpeg_image_load;
 	module->begin_load = gdk_pixbuf__jpeg_image_begin_load;
@@ -1288,8 +1287,7 @@ MODULE_ENTRY (jpeg, fill_vtable) (GdkPixbufModule *module)
 	module->save_to_callback = gdk_pixbuf__jpeg_image_save_to_callback;
 }
 
-void
-MODULE_ENTRY (jpeg, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
 	static GdkPixbufModulePattern signature[] = {
 		{ "\xff\xd8", NULL, 100 },
diff --git a/gdk-pixbuf/io-pcx.c b/gdk-pixbuf/io-pcx.c
index 2fdf1e79b..4d6c2054d 100644
--- a/gdk-pixbuf/io-pcx.c
+++ b/gdk-pixbuf/io-pcx.c
@@ -720,21 +720,19 @@ gdk_pixbuf__pcx_stop_load(gpointer data, GError **error)
 }
 
 #ifndef INCLUDE_pcx
-#define MODULE_ENTRY(type,function) function
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
-#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#define MODULE_ENTRY(function) void _gdk_pixbuf__pcx_ ## function
 #endif
 
-void
-MODULE_ENTRY (pcx, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
 	module->begin_load = gdk_pixbuf__pcx_begin_load;
 	module->stop_load = gdk_pixbuf__pcx_stop_load;
 	module->load_increment = gdk_pixbuf__pcx_load_increment;
 }
 
-void
-MODULE_ENTRY (pcx, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
 	static GdkPixbufModulePattern signature[] = {
 		{ "\x0a \x01", NULL, 100 },
diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
index 117f7372e..c030fdee2 100644
--- a/gdk-pixbuf/io-png.c
+++ b/gdk-pixbuf/io-png.c
@@ -1010,13 +1010,12 @@ gdk_pixbuf__png_image_save_to_callback (GdkPixbufSaveFunc   save_func,
 }
 
 #ifndef INCLUDE_png
-#define MODULE_ENTRY(type,function) function
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
-#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#define MODULE_ENTRY(function) void _gdk_pixbuf__png_ ## function
 #endif
 
-void
-MODULE_ENTRY (png, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
         module->load = gdk_pixbuf__png_image_load;
         module->begin_load = gdk_pixbuf__png_image_begin_load;
@@ -1026,8 +1025,7 @@ MODULE_ENTRY (png, fill_vtable) (GdkPixbufModule *module)
         module->save_to_callback = gdk_pixbuf__png_image_save_to_callback;
 }
 
-void
-MODULE_ENTRY (png, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
         static GdkPixbufModulePattern signature[] = {
                 { "\x89PNG\r\n\x1a\x0a", NULL, 100 },
diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c
index 37f726b30..64dca62d1 100644
--- a/gdk-pixbuf/io-pnm.c
+++ b/gdk-pixbuf/io-pnm.c
@@ -1037,13 +1037,12 @@ gdk_pixbuf__pnm_image_load_increment (gpointer data,
 }
 
 #ifndef INCLUDE_pnm
-#define MODULE_ENTRY(type,function) function
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
-#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#define MODULE_ENTRY(function) void _gdk_pixbuf__pnm_ ## function
 #endif
 
-void
-MODULE_ENTRY (pnm, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
 	module->load = gdk_pixbuf__pnm_image_load;
 	module->begin_load = gdk_pixbuf__pnm_image_begin_load;
@@ -1051,8 +1050,7 @@ MODULE_ENTRY (pnm, fill_vtable) (GdkPixbufModule *module)
 	module->load_increment = gdk_pixbuf__pnm_image_load_increment;
 }
 
-void
-MODULE_ENTRY (pnm, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
 	static GdkPixbufModulePattern signature[] = {
 		{ "P1", NULL, 100 },
diff --git a/gdk-pixbuf/io-ras.c b/gdk-pixbuf/io-ras.c
index 9b8a7d628..655556edd 100644
--- a/gdk-pixbuf/io-ras.c
+++ b/gdk-pixbuf/io-ras.c
@@ -512,21 +512,19 @@ gdk_pixbuf__ras_image_load_increment(gpointer data,
 }
 
 #ifndef INCLUDE_ras
-#define MODULE_ENTRY(type,function) function
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
-#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#define MODULE_ENTRY(function) void _gdk_pixbuf__ras_ ## function
 #endif
 
-void
-MODULE_ENTRY (ras, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
 	module->begin_load = gdk_pixbuf__ras_image_begin_load;
 	module->stop_load = gdk_pixbuf__ras_image_stop_load;
 	module->load_increment = gdk_pixbuf__ras_image_load_increment;
 }
 
-void
-MODULE_ENTRY (ras, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
 	static GdkPixbufModulePattern signature[] = {
 		{ "\x59\xa6\x6a\x95", NULL, 100 },
diff --git a/gdk-pixbuf/io-tga.c b/gdk-pixbuf/io-tga.c
index 3a719c542..6097b169b 100644
--- a/gdk-pixbuf/io-tga.c
+++ b/gdk-pixbuf/io-tga.c
@@ -962,21 +962,19 @@ static gboolean gdk_pixbuf__tga_stop_load(gpointer data, GError **err)
 }
 
 #ifndef INCLUDE_tga
-#define MODULE_ENTRY(type,function) function
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
-#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#define MODULE_ENTRY(function) void _gdk_pixbuf__tga_ ## function
 #endif
 
-void
-MODULE_ENTRY (tga, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
 	module->begin_load = gdk_pixbuf__tga_begin_load;
 	module->stop_load = gdk_pixbuf__tga_stop_load;
 	module->load_increment = gdk_pixbuf__tga_load_increment;
 }
 
-void
-MODULE_ENTRY (tga, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
 	static GdkPixbufModulePattern signature[] = {
 		{ " \x1\x1", "x  ", 100 },
diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c
index 215c130b3..64da06488 100644
--- a/gdk-pixbuf/io-tiff.c
+++ b/gdk-pixbuf/io-tiff.c
@@ -777,13 +777,12 @@ gdk_pixbuf__tiff_image_save (FILE          *f,
 }
 
 #ifndef INCLUDE_tiff
-#define MODULE_ENTRY(type,function) function
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
-#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#define MODULE_ENTRY(function) void _gdk_pixbuf__tiff_ ## function
 #endif
 
-void
-MODULE_ENTRY (tiff, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
         module->load = gdk_pixbuf__tiff_image_load;
         module->begin_load = gdk_pixbuf__tiff_image_begin_load;
@@ -793,8 +792,7 @@ MODULE_ENTRY (tiff, fill_vtable) (GdkPixbufModule *module)
         module->save_to_callback = gdk_pixbuf__tiff_image_save_to_callback;
 }
 
-void
-MODULE_ENTRY (tiff, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
         static GdkPixbufModulePattern signature[] = {
                 { "MM \x2a", "  z ", 100 },
diff --git a/gdk-pixbuf/io-wbmp.c b/gdk-pixbuf/io-wbmp.c
index b7d75a41e..1319e1547 100644
--- a/gdk-pixbuf/io-wbmp.c
+++ b/gdk-pixbuf/io-wbmp.c
@@ -340,21 +340,19 @@ static gboolean gdk_pixbuf__wbmp_image_load_increment(gpointer data,
 }
 
 #ifndef INCLUDE_wbmp
-#define MODULE_ENTRY(type,function) function
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
-#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#define MODULE_ENTRY(function) void _gdk_pixbuf__wbmp_ ## function
 #endif
 
-void
-MODULE_ENTRY (wbmp, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
 	module->begin_load = gdk_pixbuf__wbmp_image_begin_load;
 	module->stop_load = gdk_pixbuf__wbmp_image_stop_load;
 	module->load_increment = gdk_pixbuf__wbmp_image_load_increment;
 }
 
-void
-MODULE_ENTRY (wbmp, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
 	static GdkPixbufModulePattern signature[] = {
 		{ "  ",    "zz", 1 }, 
diff --git a/gdk-pixbuf/io-xbm.c b/gdk-pixbuf/io-xbm.c
index a649afb4b..1b5a17e42 100644
--- a/gdk-pixbuf/io-xbm.c
+++ b/gdk-pixbuf/io-xbm.c
@@ -458,13 +458,12 @@ gdk_pixbuf__xbm_image_load_increment (gpointer       data,
 }
 
 #ifndef INCLUDE_xbm
-#define MODULE_ENTRY(type,function) function
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
-#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#define MODULE_ENTRY(function) void _gdk_pixbuf__xbm_ ## function
 #endif
 
-void
-MODULE_ENTRY (xbm, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
 	module->load = gdk_pixbuf__xbm_image_load;
 	module->begin_load = gdk_pixbuf__xbm_image_begin_load;
@@ -472,8 +471,7 @@ MODULE_ENTRY (xbm, fill_vtable) (GdkPixbufModule *module)
 	module->load_increment = gdk_pixbuf__xbm_image_load_increment;
 }
 
-void
-MODULE_ENTRY (xbm, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
 	static GdkPixbufModulePattern signature[] = {
 		{ "#define ", NULL, 100 },
diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c
index 558196f84..ea9603dfe 100644
--- a/gdk-pixbuf/io-xpm.c
+++ b/gdk-pixbuf/io-xpm.c
@@ -782,13 +782,12 @@ gdk_pixbuf__xpm_image_load_increment (gpointer data,
 }
 
 #ifndef INCLUDE_xpm
-#define MODULE_ENTRY(type,function) function
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
-#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#define MODULE_ENTRY(function) void _gdk_pixbuf__xpm_ ## function
 #endif
 
-void
-MODULE_ENTRY (xpm, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
 	module->load = gdk_pixbuf__xpm_image_load;
 	module->load_xpm_data = gdk_pixbuf__xpm_image_load_xpm_data;
@@ -797,8 +796,7 @@ MODULE_ENTRY (xpm, fill_vtable) (GdkPixbufModule *module)
 	module->load_increment = gdk_pixbuf__xpm_image_load_increment;
 }
 
-void
-MODULE_ENTRY (xpm, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
 	static GdkPixbufModulePattern signature[] = {
 		{ "/* XPM */", NULL, 100 },