Include alias header when using built-in loaders

If we're building a loader like png into gdk-pixbuf, we need to
include the alias header.  Otherwise we get internal PLT entries,
which makes make check fail.

https://bugzilla.gnome.org/show_bug.cgi?id=623314

25 files changed, 103 insertions, 0 deletions

diff --git a/gdk-pixbuf/io-ani.c b/gdk-pixbuf/io-ani.c
index fc1a68604..26212a2ff 100644
--- a/gdk-pixbuf/io-ani.c
+++ b/gdk-pixbuf/io-ani.c
@@ -30,6 +30,10 @@
 #include "gdk-pixbuf-loader.h"
 #include "io-ani-animation.h"
 
+#ifdef INCLUDE_ani
+#include "gdk-pixbuf-alias.h"
+#endif
+
 static int
 lsb_32 (guchar *src)
 {
diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c
index 26ffb62c8..7d50127b8 100644
--- a/gdk-pixbuf/io-bmp.c
+++ b/gdk-pixbuf/io-bmp.c
@@ -32,6 +32,10 @@
 #include <string.h>
 #include "gdk-pixbuf-private.h"
 
+#ifdef INCLUDE_bmp
+#include "gdk-pixbuf-alias.h"
+#endif
+
 #define DUMPBIH 0
 
 
diff --git a/gdk-pixbuf/io-gdip-bmp.c b/gdk-pixbuf/io-gdip-bmp.c
index 40f6a5f53..805967831 100644
--- a/gdk-pixbuf/io-gdip-bmp.c
+++ b/gdk-pixbuf/io-gdip-bmp.c
@@ -23,6 +23,10 @@
 

 #include "io-gdip-utils.h"

 

+#ifdef INCLUDE_gdiplus

+#include "gdk-pixbuf-alias.h"

+#endif

+

 static gboolean

 gdk_pixbuf__gdip_image_save_BMP_to_callback (GdkPixbufSaveFunc   save_func,

                                              gpointer            user_data,

diff --git a/gdk-pixbuf/io-gdip-emf.c b/gdk-pixbuf/io-gdip-emf.c
index 07ee0b020..6262381db 100644
--- a/gdk-pixbuf/io-gdip-emf.c
+++ b/gdk-pixbuf/io-gdip-emf.c
@@ -23,6 +23,10 @@
 
 #include "io-gdip-utils.h"
 
+#ifdef INCLUDE_gdiplus
+#include "gdk-pixbuf-alias.h"
+#endif
+
 #ifndef INCLUDE_gdiplus
 #define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
diff --git a/gdk-pixbuf/io-gdip-gif.c b/gdk-pixbuf/io-gdip-gif.c
index f991a9d3d..653735398 100644
--- a/gdk-pixbuf/io-gdip-gif.c
+++ b/gdk-pixbuf/io-gdip-gif.c
@@ -23,6 +23,10 @@
 

 #include "io-gdip-utils.h"

 

+#ifdef INCLUDE_gdiplus

+#include "gdk-pixbuf-alias.h"

+#endif

+

 static gboolean

 gdk_pixbuf__gdip_image_save_GIF_to_callback (GdkPixbufSaveFunc   save_func,

                                              gpointer            user_data,

diff --git a/gdk-pixbuf/io-gdip-ico.c b/gdk-pixbuf/io-gdip-ico.c
index 8538b5811..a24568505 100644
--- a/gdk-pixbuf/io-gdip-ico.c
+++ b/gdk-pixbuf/io-gdip-ico.c
@@ -23,6 +23,10 @@
 
 #include "io-gdip-utils.h"
 
+#ifdef INCLUDE_gdiplus
+#include "gdk-pixbuf-alias.h"
+#endif
+
 #ifndef INCLUDE_gdiplus
 #define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
diff --git a/gdk-pixbuf/io-gdip-jpeg.c b/gdk-pixbuf/io-gdip-jpeg.c
index 8bd305860..b7cf85925 100644
--- a/gdk-pixbuf/io-gdip-jpeg.c
+++ b/gdk-pixbuf/io-gdip-jpeg.c
@@ -24,6 +24,10 @@
 #define INITGUID

 #include "io-gdip-utils.h"

 

+#ifdef INCLUDE_gdiplus

+#include "gdk-pixbuf-alias.h"

+#endif

+

 DEFINE_GUID(EncoderQuality, 0x1d5be4b5,0xfa4a,0x452d,0x9c,0xdd,0x5d,0xb3,0x51,0x05,0xe7,0xeb);

 

 static gboolean

diff --git a/gdk-pixbuf/io-gdip-png.c b/gdk-pixbuf/io-gdip-png.c
index 8b094bfca..16d11a5ce 100644
--- a/gdk-pixbuf/io-gdip-png.c
+++ b/gdk-pixbuf/io-gdip-png.c
@@ -24,6 +24,10 @@
 #define INITGUID

 #include "io-gdip-utils.h"

 

+#ifdef INCLUDE_gdiplus

+#include "gdk-pixbuf-alias.h"

+#endif

+

 DEFINE_GUID(EncoderCompression, 0xe09d739d,0xccd4,0x44ee,0x8e,0xba,0x3f,0xbf,0x8b,0xe4,0xfc,0x58);

 

 static gboolean

diff --git a/gdk-pixbuf/io-gdip-tiff.c b/gdk-pixbuf/io-gdip-tiff.c
index 7e0a1898e..2edd0819c 100644
--- a/gdk-pixbuf/io-gdip-tiff.c
+++ b/gdk-pixbuf/io-gdip-tiff.c
@@ -23,6 +23,10 @@
 

 #include "io-gdip-utils.h"

 

+#ifdef INCLUDE_gdiplus

+#include "gdk-pixbuf-alias.h"

+#endif

+

 static gboolean

 gdk_pixbuf__gdip_image_save_TIFF_to_callback (GdkPixbufSaveFunc   save_func,

                                               gpointer            user_data,

diff --git a/gdk-pixbuf/io-gdip-wmf.c b/gdk-pixbuf/io-gdip-wmf.c
index 3c89d4a3d..3a5f1d527 100644
--- a/gdk-pixbuf/io-gdip-wmf.c
+++ b/gdk-pixbuf/io-gdip-wmf.c
@@ -23,6 +23,10 @@
 
 #include "io-gdip-utils.h"
 
+#ifdef INCLUDE_gdiplus
+#include "gdk-pixbuf-alias.h"
+#endif
+
 #ifndef INCLUDE_gdiplus
 #define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c
index 0b370ee2b..45ac1357c 100644
--- a/gdk-pixbuf/io-gif.c
+++ b/gdk-pixbuf/io-gif.c
@@ -60,6 +60,10 @@
 #include "gdk-pixbuf-private.h"
 #include "io-gif-animation.h"
 
+#ifdef INCLUDE_gif
+#include "gdk-pixbuf-alias.h"
+#endif
+
 
 
 #undef DUMP_IMAGE_DETAILS 
diff --git a/gdk-pixbuf/io-icns.c b/gdk-pixbuf/io-icns.c
index 00cdc50f7..6f5cb539c 100644
--- a/gdk-pixbuf/io-icns.c
+++ b/gdk-pixbuf/io-icns.c
@@ -29,6 +29,10 @@
 #include "gdk-pixbuf-private.h"
 #include "gdk-pixbuf-loader.h"
 
+#ifdef INCLUDE_icns
+#include "gdk-pixbuf-alias.h"
+#endif
+
 G_MODULE_EXPORT void fill_vtable (GdkPixbufModule * module);
 G_MODULE_EXPORT void fill_info (GdkPixbufFormat * info);
 
diff --git a/gdk-pixbuf/io-ico.c b/gdk-pixbuf/io-ico.c
index da00d1cb6..2eaa6e78d 100644
--- a/gdk-pixbuf/io-ico.c
+++ b/gdk-pixbuf/io-ico.c
@@ -44,6 +44,10 @@ Known bugs:
 #include <errno.h>
 #include "gdk-pixbuf-private.h"
 
+#ifdef INCLUDE_ico
+#include "gdk-pixbuf-alias.h"
+#endif
+
 
 
 /* 
diff --git a/gdk-pixbuf/io-jasper.c b/gdk-pixbuf/io-jasper.c
index 72046c68f..affb9557a 100644
--- a/gdk-pixbuf/io-jasper.c
+++ b/gdk-pixbuf/io-jasper.c
@@ -25,6 +25,10 @@
 
 #include "gdk-pixbuf-private.h"
 
+#ifdef INCLUDE_jasper
+#include "gdk-pixbuf-alias.h"
+#endif
+
 #include <jasper/jasper.h>
 
 G_MODULE_EXPORT void fill_vtable (GdkPixbufModule * module);
diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index c41914d4f..a33e5438f 100644
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -36,6 +36,10 @@
 #include <jerror.h>
 #include "gdk-pixbuf-private.h"
 
+#ifdef INCLUDE_jpeg
+#include "gdk-pixbuf-alias.h"
+#endif
+
 #ifndef HAVE_SIGSETJMP
 #define sigjmp_buf jmp_buf
 #define sigsetjmp(jb, x) setjmp(jb)
diff --git a/gdk-pixbuf/io-pcx.c b/gdk-pixbuf/io-pcx.c
index a36f399ba..320891895 100644
--- a/gdk-pixbuf/io-pcx.c
+++ b/gdk-pixbuf/io-pcx.c
@@ -26,6 +26,10 @@
 #include <string.h>
 #include "gdk-pixbuf-private.h"
 
+#ifdef INCLUDE_pcx
+#include "gdk-pixbuf-alias.h"
+#endif
+
 #undef PCX_DEBUG
 
 #define PCX_TASK_DONE 0
diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
index 79c81fd78..ef46e63dd 100644
--- a/gdk-pixbuf/io-png.c
+++ b/gdk-pixbuf/io-png.c
@@ -29,6 +29,10 @@
 #include <png.h>
 #include "gdk-pixbuf-private.h"
 
+#ifdef INCLUDE_png
+#include "gdk-pixbuf-alias.h"
+#endif
+
 
 
 static gboolean
diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c
index 292fd3a7f..c2a154c89 100644
--- a/gdk-pixbuf/io-pnm.c
+++ b/gdk-pixbuf/io-pnm.c
@@ -29,6 +29,9 @@
 #include <setjmp.h>
 #include "gdk-pixbuf-private.h"
 
+#ifdef INCLUDE_pnm
+#include "gdk-pixbuf-alias.h"
+#endif
 
 #define PNM_BUF_SIZE 4096
 
diff --git a/gdk-pixbuf/io-qtif.c b/gdk-pixbuf/io-qtif.c
index 667264049..ef74e0dec 100644
--- a/gdk-pixbuf/io-qtif.c
+++ b/gdk-pixbuf/io-qtif.c
@@ -34,6 +34,10 @@
 #include "gdk-pixbuf.h"
 #include "gdk-pixbuf-private.h"
 
+#ifdef INCLUDE_qtif
+#include "gdk-pixbuf-alias.h"
+#endif
+
 /***
  * Definitions
  */
diff --git a/gdk-pixbuf/io-ras.c b/gdk-pixbuf/io-ras.c
index ee79f1a38..db0763fa9 100644
--- a/gdk-pixbuf/io-ras.c
+++ b/gdk-pixbuf/io-ras.c
@@ -39,6 +39,10 @@ Known bugs:
 #include <string.h>
 #include "gdk-pixbuf-private.h"
 
+#ifdef INCLUDE_ras
+#include "gdk-pixbuf-alias.h"
+#endif
+
 
 
 /* 
diff --git a/gdk-pixbuf/io-tga.c b/gdk-pixbuf/io-tga.c
index 5ef14fade..113d5ea52 100644
--- a/gdk-pixbuf/io-tga.c
+++ b/gdk-pixbuf/io-tga.c
@@ -37,6 +37,10 @@
 
 #include "gdk-pixbuf-private.h"
 
+#ifdef INCLUDE_tga
+#include "gdk-pixbuf-alias.h"
+#endif
+
 #undef DEBUG_TGA
 
 #define TGA_INTERLEAVE_MASK     0xc0
diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c
index 49eea8917..80e6938d7 100644
--- a/gdk-pixbuf/io-tiff.c
+++ b/gdk-pixbuf/io-tiff.c
@@ -37,6 +37,10 @@
 #include <errno.h>
 #include "gdk-pixbuf-private.h"
 
+#ifdef INCLUDE_tiff
+#include "gdk-pixbuf-alias.h"
+#endif
+
 #ifdef G_OS_WIN32
 #include <fcntl.h>
 #include <io.h>
diff --git a/gdk-pixbuf/io-wbmp.c b/gdk-pixbuf/io-wbmp.c
index e961322f8..a882d0434 100644
--- a/gdk-pixbuf/io-wbmp.c
+++ b/gdk-pixbuf/io-wbmp.c
@@ -37,6 +37,10 @@ Known bugs:
 #include <string.h>
 #include "gdk-pixbuf-private.h"
 
+#ifdef INCLUDE_wbmp
+#include "gdk-pixbuf-alias.h"
+#endif
+
 
 
 /* Progressive loading */
diff --git a/gdk-pixbuf/io-xbm.c b/gdk-pixbuf/io-xbm.c
index faab8dbd6..32bf295a3 100644
--- a/gdk-pixbuf/io-xbm.c
+++ b/gdk-pixbuf/io-xbm.c
@@ -39,6 +39,12 @@
 #include <errno.h>
 #include "gdk-pixbuf-private.h"
 #include <glib/gstdio.h>
+
+#ifdef INCLUDE_xbm
+#include "gdk-pixbuf-alias.h"
+#endif
+
+
 
 
 typedef struct _XBMData XBMData;
diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c
index 5d7becec4..558609eb3 100644
--- a/gdk-pixbuf/io-xpm.c
+++ b/gdk-pixbuf/io-xpm.c
@@ -34,6 +34,12 @@
 #include <errno.h>
 #include "gdk-pixbuf-private.h"
 #include <glib/gstdio.h>
+
+#ifdef INCLUDE_xpm
+#include "gdk-pixbuf-alias.h"
+#endif
+
+
 
 
 /* I have must have done something to deserve this.