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

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 9753b11221559d013aa77566a2aab84bcf411e61..a83258cfcf6519dedbfd11e5fd00ad5d315c7578 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2008-05-27  Michael Natterer  <mitch@imendio.com>
 
        * gdk-pixbuf.c: put back the #define, but call it

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index b320f2996df87752f947f5eef1e98c097f56e478..aeccae0bc54179853930d693bb4dbaf1c1eb39e5 100644 (file)
--- 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 5a6f598503d8c11682d3e29848aec22c29a39fd5..62c676ff5cc9f6818bc5ea464036d0abafeb036c 100644 (file)
--- 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 65e560b8ba9bc4988f8d22b56190066a3c02c910..1ed68bd0680b6f440a6e308a0f5ce10695d4959c 100644 (file)
--- 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 278c1ba993e22a78b36952c89638485692c479ad..33368c0447aa16da50a2a4f29260ae3ffcdc2368 100644 (file)
--- 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 491f9cdc80a5dce3d9182d01a2fd8c450a1deb80..6a3cfa01102bbe9b91e26da47530b13bd5a6e163 100644 (file)
--- 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 62a85233456c87803410d028d41be9a2c8eb41a1..fb043d6bcd7a10f5d6eddd2d977ed5613066f044 100644 (file)
--- 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 f25ecec3dc7115a39b4e74f77d86faba6ea28d3a..1fe1eff848fbfe8da07d96e3e1c894e82acd2922 100644 (file)
--- 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 5194ebd0016eae9469badd079b7384a5039a6393..c6f9bc29439e52b48375d9704c8cb024915959f6 100644 (file)
--- 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 7df7e1cd5c0b3fe0d7a41cee36dfab3b1f108b50..2e25871f036a69c5ce4f13cae75593b77dde8ebc 100644 (file)
--- 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 2fdf1e79b7776f0209a7179a879feb5a2941c42b..4d6c2054dd7f9e16e205345531ea9aa872c65822 100644 (file)
--- 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 117f7372ee42493bc85b805da7bc0c11ed0f31ef..c030fdee2ff7634e596b915432876ae2472111a9 100644 (file)
--- 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 37f726b30c086c80353914118f34afd4de333da0..64dca62d17fff1c39f1bb987e973cf2e8442952c 100644 (file)
--- 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 9b8a7d628f5e425e177ccd909fb510b369f0819e..655556edd97482f751094235c5c9cad4b4209f44 100644 (file)
--- 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 3a719c5426bfaf0326ff54f3ab070a96af302eac..6097b169b2d9daaa9b04334cec103f8fa17549a8 100644 (file)
--- 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 215c130b38cd3422e21fec70698112b1699b6f07..64da064883bf560deb81a28748aadfb34b2bc5c3 100644 (file)
--- 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 b7d75a41e859ecec319150a2664fbc28dbd0f525..1319e1547c5231408ef10e8426390475dbfc3a80 100644 (file)
--- 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 a649afb4bc484b60fdc94844a52695d5d31024cb..1b5a17e42cca33524c6a9d6ef5506455ef8462d3 100644 (file)
--- 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 558196f848020b2eabcb22c418459a1b401bd88b..ea9603dfe5b0ac4cad2a99567486f6c6ed236abf 100644 (file)
--- 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 },