[gdk-pixbuf] Include alias header when using built-in loaders

From: Matthias Clasen <matthiasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gdk-pixbuf] Include alias header when using built-in loaders
Date: Tue, 6 Jul 2010 12:17:32 +0000 (UTC)
commit 72039b66e4c87b80c6f98243032a51c81d4232ab
Author: Colin Walters <walters verbum org>
Date:   Tue Jul 6 08:15:50 2010 -0400

    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

 gdk-pixbuf/io-ani.c       |    4 ++++
 gdk-pixbuf/io-bmp.c       |    4 ++++
 gdk-pixbuf/io-gdip-bmp.c  |    4 ++++
 gdk-pixbuf/io-gdip-emf.c  |    4 ++++
 gdk-pixbuf/io-gdip-gif.c  |    4 ++++
 gdk-pixbuf/io-gdip-ico.c  |    4 ++++
 gdk-pixbuf/io-gdip-jpeg.c |    4 ++++
 gdk-pixbuf/io-gdip-png.c  |    4 ++++
 gdk-pixbuf/io-gdip-tiff.c |    4 ++++
 gdk-pixbuf/io-gdip-wmf.c  |    4 ++++
 gdk-pixbuf/io-gif.c       |    4 ++++
 gdk-pixbuf/io-icns.c      |    4 ++++
 gdk-pixbuf/io-ico.c       |    4 ++++
 gdk-pixbuf/io-jasper.c    |    4 ++++
 gdk-pixbuf/io-jpeg.c      |    4 ++++
 gdk-pixbuf/io-pcx.c       |    4 ++++
 gdk-pixbuf/io-png.c       |    4 ++++
 gdk-pixbuf/io-pnm.c       |    3 +++
 gdk-pixbuf/io-qtif.c      |    4 ++++
 gdk-pixbuf/io-ras.c       |    4 ++++
 gdk-pixbuf/io-tga.c       |    4 ++++
 gdk-pixbuf/io-tiff.c      |    4 ++++
 gdk-pixbuf/io-wbmp.c      |    4 ++++
 gdk-pixbuf/io-xbm.c       |    6 ++++++
 gdk-pixbuf/io-xpm.c       |    6 ++++++
 25 files changed, 103 insertions(+), 0 deletions(-)
---
diff --git a/gdk-pixbuf/io-ani.c b/gdk-pixbuf/io-ani.c
index fc1a686..26212a2 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 26ffb62..7d50127 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 40f6a5f..8059678 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 07ee0b0..6262381 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 f991a9d..6537353 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 8538b58..a245685 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 8bd3058..b7cf859 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 8b094bf..16d11a5 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 7e0a189..2edd081 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 3c89d4a..3a5f1d5 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 0b370ee..45ac135 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 00cdc50..6f5cb53 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 da00d1c..2eaa6e7 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 72046c6..affb955 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 c41914d..a33e543 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 a36f399..3208918 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 79c81fd..ef46e63 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 292fd3a..c2a154c 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 6672640..ef74e0d 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 ee79f1a..db0763f 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 5ef14fa..113d5ea 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 49eea89..80e6938 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 e961322..a882d04 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 faab8db..32bf295 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 5d7bece..558609e 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.
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]