[gdk-pixbuf] Replace the aliasing hacks by -Bsymbolic-functions

From: Matthias Clasen <matthiasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gdk-pixbuf] Replace the aliasing hacks by -Bsymbolic-functions
Date: Sat, 10 Jul 2010 00:59:51 +0000 (UTC)
commit 3ca612e0307cea523ee75910f4f4649f031f598d
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jul 9 20:56:23 2010 -0400

    Replace the aliasing hacks by -Bsymbolic-functions
    
    This is copying similar changes from glib.

 configure.ac                                |   25 +++++
 gdk-pixbuf/Makefile.am                      |   17 +---
 gdk-pixbuf/gdk-pixbuf-animation.c           |    4 -
 gdk-pixbuf/gdk-pixbuf-data.c                |    4 -
 gdk-pixbuf/gdk-pixbuf-enum-types.c.template |    3 -
 gdk-pixbuf/gdk-pixbuf-io.c                  |    4 -
 gdk-pixbuf/gdk-pixbuf-loader.c              |    6 -
 gdk-pixbuf/gdk-pixbuf-scale.c               |    4 -
 gdk-pixbuf/gdk-pixbuf-scaled-anim.c         |    4 -
 gdk-pixbuf/gdk-pixbuf-simple-anim.c         |    4 -
 gdk-pixbuf/gdk-pixbuf-util.c                |    6 -
 gdk-pixbuf/gdk-pixbuf.c                     |    4 -
 gdk-pixbuf/gdk-pixbuf.symbols               |    4 +-
 gdk-pixbuf/gdk-pixdata.c                    |    4 -
 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                         |    4 -
 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                         |    4 -
 gdk-pixbuf/io-xpm.c                         |    4 -
 gdk-pixbuf/makegdkpixbufalias.pl            |  137 ---------------------------
 gdk-pixbuf/pltcheck.sh                      |   17 ----
 41 files changed, 29 insertions(+), 318 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index de9d3bc..a08d217 100644
--- a/configure.ac
+++ b/configure.ac
@@ -991,6 +991,31 @@ AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
 
 
 ##################################################
+# Check for -Bsymbolic-functions linker flag used
+# to avoid intra-library PLT jumps, if available.
+##################################################
+
+AC_ARG_ENABLE(Bsymbolic,
+              [AC_HELP_STRING([--disable-Bsymbolic],
+                              [avoid linking with -Bsymbolic])],,
+              [SAVED_LDFLAGS="${LDFLAGS}"
+               AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
+               LDFLAGS=-Wl,-Bsymbolic-functions
+               AC_TRY_LINK([], [int main (void) { return 0; }],
+                           AC_MSG_RESULT(yes)
+                           enable_Bsymbolic=yes,
+                           AC_MSG_RESULT(no)
+                           enable_Bsymbolic=no)
+               LDFLAGS="${SAVED_LDFLAGS}"])
+
+if test "x${enable_Bsymbolic}" == "xyes"; then
+  GDK_PIXBUF_LINK_FLAGS=-Wl,-Bsymbolic-functions
+fi
+
+AC_SUBST(GDK_PIXBUF_LINK_FLAGS)
+
+
+##################################################
 # Output commands
 ##################################################
 
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 5744511..f413d9d 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -51,14 +51,8 @@ endif
 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
 
-gdk-pixbuf-alias.h: gdk-pixbuf.symbols
-	 $(PERL) $(srcdir)/makegdkpixbufalias.pl < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-alias.h
-
-gdk-pixbuf-aliasdef.c: gdk-pixbuf.symbols
-	 $(PERL) $(srcdir)/makegdkpixbufalias.pl -def < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-aliasdef.c
-
 if OS_LINUX
-TESTS = abicheck.sh pltcheck.sh
+TESTS = abicheck.sh
 endif
 
 lib_LTLIBRARIES = libgdk_pixbuf-2.0.la
@@ -552,6 +546,7 @@ libgdk_pixbuf_2_0_la_SOURCES =   \
 	gdk-pixbuf-enum-types.c
 
 libgdk_pixbuf_2_0_la_LDFLAGS = \
+	$(GDK_PIXBUF_LINK_FLAGS)		\
 	$(gdk_pixbuf_win32_res_ldflag)		\
 	-version-info $(LT_VERSION_INFO)	\
 	$(LIBTOOL_EXPORT_OPTIONS)		\
@@ -579,14 +574,11 @@ libgdk_pixbufinclude_HEADERS =  	\
 	gdk-pixdata.h
 
 noinst_HEADERS = 		\
-	gdk-pixbuf-alias.h	\
 	gdk-pixbuf-private.h	\
 	gdk-pixbuf-scaled-anim.h \
 	xpm-color-table.h
 
 BUILT_SOURCES = 		\
-	gdk-pixbuf-alias.h	\
-	gdk-pixbuf-aliasdef.c	\
 	gdk-pixbuf-enum-types.h \
 	gdk-pixbuf-enum-types.c \
 	gdk-pixbuf-marshal.h 	\
@@ -595,7 +587,6 @@ BUILT_SOURCES = 		\
 
 CLEANFILES =
 MAINTAINERCLEANFILES = 		\
-	gdk-pixbuf-aliasdef.c	\
 	gdk-pixbuf-enum-types.h \
 	gdk-pixbuf-enum-types.c \
 	gdk-pixbuf-marshal.h 	\
@@ -646,7 +637,7 @@ MAINTAINERCLEANFILES += stamp-gdk-pixbuf-marshal.h
 # gdk-pixbuf-marshal.c
 #
 $(srcdir)/gdk-pixbuf-marshal.c: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
-	(echo -e "#include <gdk-pixbuf/gdk-pixbuf.h>\n#include \"gdk-pixbuf-alias.h\"" | $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --body ) >> xgen-gmc \
+	(echo -e "#include <gdk-pixbuf/gdk-pixbuf.h>\n" | $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --body ) >> xgen-gmc \
 	&& cp xgen-gmc gdk-pixbuf-marshal.c \
 	&& rm -f xgen-gmc xgen-gmc~
 
@@ -663,9 +654,7 @@ EXTRA_DIST +=					\
         gdk-pixbuf-csource.1			\
 	makefile.msc				\
 	gdk-pixbuf.symbols			\
-	makegdkpixbufalias.pl			\
 	abicheck.sh				\
-	pltcheck.sh				\
 	gdk_pixbuf.def				\
 	gdk_pixbuf.rc				\
 	gdk-pixbuf-marshal.c			\
diff --git a/gdk-pixbuf/gdk-pixbuf-animation.c b/gdk-pixbuf/gdk-pixbuf-animation.c
index 5b500f6..272a763 100644
--- a/gdk-pixbuf/gdk-pixbuf-animation.c
+++ b/gdk-pixbuf/gdk-pixbuf-animation.c
@@ -26,7 +26,6 @@
 #include <errno.h>
 #include "gdk-pixbuf-private.h"
 #include "gdk-pixbuf-animation.h"
-#include "gdk-pixbuf-alias.h"
 
 #include <glib/gstdio.h>
 
@@ -727,6 +726,3 @@ gdk_pixbuf_non_anim_iter_advance (GdkPixbufAnimationIter *iter,
         /* Advancing never requires a refresh */
         return FALSE;
 }
-
-#define __GDK_PIXBUF_ANIMATION_C__
-#include "gdk-pixbuf-aliasdef.c"
diff --git a/gdk-pixbuf/gdk-pixbuf-data.c b/gdk-pixbuf/gdk-pixbuf-data.c
index 800d64d..87af0b9 100644
--- a/gdk-pixbuf/gdk-pixbuf-data.c
+++ b/gdk-pixbuf/gdk-pixbuf-data.c
@@ -23,7 +23,6 @@
 #include "config.h"
 #include "gdk-pixbuf.h"
 #include "gdk-pixbuf-private.h"
-#include "gdk-pixbuf-alias.h"
 #include <stdlib.h>
 #include <string.h>
 
@@ -78,6 +77,3 @@ gdk_pixbuf_new_from_data (const guchar *data, GdkColorspace colorspace, gboolean
 
 	return pixbuf;
 }
-
-#define __GDK_PIXBUF_DATA_C__
-#include "gdk-pixbuf-aliasdef.c"
diff --git a/gdk-pixbuf/gdk-pixbuf-enum-types.c.template b/gdk-pixbuf/gdk-pixbuf-enum-types.c.template
index 8496c13..9c7a972 100644
--- a/gdk-pixbuf/gdk-pixbuf-enum-types.c.template
+++ b/gdk-pixbuf/gdk-pixbuf-enum-types.c.template
@@ -1,6 +1,5 @@
 /*** BEGIN file-header ***/
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include "gdk-pixbuf-alias.h"
 
 /*** END file-header ***/
 
@@ -33,6 +32,4 @@ GType
 /*** END value-tail ***/
 
 /*** BEGIN file-tail ***/
-#define __GDK_PIXBUF_ENUM_TYPES_C__
-#include "gdk-pixbuf-aliasdef.c"
 /*** END file-tail ***/
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 2da98bd..3b9d518 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -37,7 +37,6 @@
 
 #include "gdk-pixbuf-private.h"
 #include "gdk-pixbuf-loader.h"
-#include "gdk-pixbuf-alias.h"
 
 #include <glib/gstdio.h>
 
@@ -2721,6 +2720,3 @@ gdk_pixbuf_format_get_type (void)
         }
         return format_id__volatile;
 }
-
-#define __GDK_PIXBUF_IO_C__
-#include "gdk-pixbuf-aliasdef.c"
diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
index e4ae74b..3d6ba6b 100644
--- a/gdk-pixbuf/gdk-pixbuf-loader.c
+++ b/gdk-pixbuf/gdk-pixbuf-loader.c
@@ -32,7 +32,6 @@
 #include "gdk-pixbuf-scaled-anim.h"
 #include "gdk-pixbuf-loader.h"
 #include "gdk-pixbuf-marshal.h"
-#include "gdk-pixbuf-alias.h"
 
 enum {
         SIZE_PREPARED,
@@ -781,8 +780,3 @@ gdk_pixbuf_loader_get_format (GdkPixbufLoader *loader)
         else
                 return NULL;
 }
-
-
-#define __GDK_PIXBUF_LOADER_C__
-#include "gdk-pixbuf-aliasdef.c"
-
diff --git a/gdk-pixbuf/gdk-pixbuf-scale.c b/gdk-pixbuf/gdk-pixbuf-scale.c
index e060018..6039845 100644
--- a/gdk-pixbuf/gdk-pixbuf-scale.c
+++ b/gdk-pixbuf/gdk-pixbuf-scale.c
@@ -26,7 +26,6 @@
 #include "gdk-pixbuf-transform.h"
 #include "gdk-pixbuf-private.h"
 #include "pixops/pixops.h"
-#include "gdk-pixbuf-alias.h"
 
 
 
@@ -459,6 +458,3 @@ gdk_pixbuf_flip (const GdkPixbuf *src,
 
   return dest;
 }
-				     
-#define __GDK_PIXBUF_SCALE_C__
-#include "gdk-pixbuf-aliasdef.c"
diff --git a/gdk-pixbuf/gdk-pixbuf-scaled-anim.c b/gdk-pixbuf/gdk-pixbuf-scaled-anim.c
index 06d1cc0..f365590 100644
--- a/gdk-pixbuf/gdk-pixbuf-scaled-anim.c
+++ b/gdk-pixbuf/gdk-pixbuf-scaled-anim.c
@@ -27,7 +27,6 @@
 #include "gdk-pixbuf.h"
 #include "gdk-pixbuf-io.h"
 #include "gdk-pixbuf-scaled-anim.h"
-#include "gdk-pixbuf-alias.h"
 
 
 struct _GdkPixbufScaledAnimClass
@@ -281,6 +280,3 @@ gdk_pixbuf_scaled_anim_iter_class_init (GdkPixbufScaledAnimIterClass *klass)
         anim_iter_class->on_currently_loading_frame = on_currently_loading_frame;
         anim_iter_class->advance = advance;
 }
-
-#define __GDK_PIXBUF_SCALED_ANIM_C__
-#include "gdk-pixbuf-aliasdef.c"
diff --git a/gdk-pixbuf/gdk-pixbuf-simple-anim.c b/gdk-pixbuf/gdk-pixbuf-simple-anim.c
index f09c036..b52dfbd 100644
--- a/gdk-pixbuf/gdk-pixbuf-simple-anim.c
+++ b/gdk-pixbuf/gdk-pixbuf-simple-anim.c
@@ -32,7 +32,6 @@
 #include "gdk-pixbuf.h"
 #include "gdk-pixbuf-private.h"
 #include "gdk-pixbuf-simple-anim.h"
-#include "gdk-pixbuf-alias.h"
 
 struct _GdkPixbufSimpleAnimClass
 {
@@ -547,6 +546,3 @@ gdk_pixbuf_simple_anim_get_loop (GdkPixbufSimpleAnim *animation)
 
         return animation->loop;
 }
-
-#define __GDK_PIXBUF_SIMPLE_ANIM_C__
-#include "gdk-pixbuf-aliasdef.c"
diff --git a/gdk-pixbuf/gdk-pixbuf-util.c b/gdk-pixbuf/gdk-pixbuf-util.c
index 2f61c0a..4b29669 100644
--- a/gdk-pixbuf/gdk-pixbuf-util.c
+++ b/gdk-pixbuf/gdk-pixbuf-util.c
@@ -27,7 +27,6 @@
 
 #include "gdk-pixbuf-transform.h"
 #include "gdk-pixbuf-private.h"
-#include "gdk-pixbuf-alias.h"
 
 
 
@@ -349,8 +348,3 @@ gdk_pixbuf_gettext (const gchar *msgid)
 
         return g_dgettext (GETTEXT_PACKAGE, msgid);
 }
-
-
-#define __GDK_PIXBUF_UTIL_C__
-#include "gdk-pixbuf-aliasdef.c"
-
diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c
index c38b782..824e290 100644
--- a/gdk-pixbuf/gdk-pixbuf.c
+++ b/gdk-pixbuf/gdk-pixbuf.c
@@ -37,7 +37,6 @@
 /* Include the marshallers */
 #include <glib-object.h>
 #include "gdk-pixbuf-marshal.c"
-#include "gdk-pixbuf-alias.h"
 
 static void gdk_pixbuf_finalize     (GObject        *object);
 static void gdk_pixbuf_set_property (GObject        *object,
@@ -764,6 +763,3 @@ gdk_pixbuf_get_property (GObject         *object,
                   break;
           }
 }
-
-#define __GDK_PIXBUF_C__
-#include "gdk-pixbuf-aliasdef.c"
diff --git a/gdk-pixbuf/gdk-pixbuf.symbols b/gdk-pixbuf/gdk-pixbuf.symbols
index 03bd08a..54d426f 100644
--- a/gdk-pixbuf/gdk-pixbuf.symbols
+++ b/gdk-pixbuf/gdk-pixbuf.symbols
@@ -1,7 +1,5 @@
 /* This file lists all exported symbols. It is used to generate
- * the gdk_pixbuf.def file used to control exports on Windows and the
- * gdk-pixbuf-alias.h/gdk-pixbuf-aliasdef.c files used to avoid PLT
- * entries for internal uses of exported functions (see makegdkpixbufalias.pl).
+ * the gdk_pixbuf.def file used to control exports on Windows
  *
  * Every symbol must be included in the right
  * #ifdef IN_HEADER(sym) #endif and
diff --git a/gdk-pixbuf/gdk-pixdata.c b/gdk-pixbuf/gdk-pixdata.c
index 13fc85f..4db8514 100644
--- a/gdk-pixbuf/gdk-pixdata.c
+++ b/gdk-pixbuf/gdk-pixdata.c
@@ -20,7 +20,6 @@
 
 #include "gdk-pixbuf-private.h"
 #include "gdk-pixdata.h"
-#include "gdk-pixbuf-alias.h"
 #include <string.h>
 
 #define APPEND g_string_append_printf
@@ -898,6 +897,3 @@ gdk_pixbuf_new_from_inline (gint          data_length,
 
   return gdk_pixbuf_from_pixdata (&pixdata, copy_pixels, error);
 }
-
-#define __GDK_PIXDATA_C__
-#include "gdk-pixbuf-aliasdef.c"
diff --git a/gdk-pixbuf/io-ani.c b/gdk-pixbuf/io-ani.c
index 26212a2..fc1a686 100644
--- a/gdk-pixbuf/io-ani.c
+++ b/gdk-pixbuf/io-ani.c
@@ -30,10 +30,6 @@
 #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 7d50127..26ffb62 100644
--- a/gdk-pixbuf/io-bmp.c
+++ b/gdk-pixbuf/io-bmp.c
@@ -32,10 +32,6 @@
 #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 8059678..40f6a5f 100644
--- a/gdk-pixbuf/io-gdip-bmp.c
+++ b/gdk-pixbuf/io-gdip-bmp.c
@@ -23,10 +23,6 @@
 
 #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 6262381..07ee0b0 100644
--- a/gdk-pixbuf/io-gdip-emf.c
+++ b/gdk-pixbuf/io-gdip-emf.c
@@ -23,10 +23,6 @@
 
 #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 6537353..f991a9d 100644
--- a/gdk-pixbuf/io-gdip-gif.c
+++ b/gdk-pixbuf/io-gdip-gif.c
@@ -23,10 +23,6 @@
 
 #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 a245685..8538b58 100644
--- a/gdk-pixbuf/io-gdip-ico.c
+++ b/gdk-pixbuf/io-gdip-ico.c
@@ -23,10 +23,6 @@
 
 #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 b7cf859..8bd3058 100644
--- a/gdk-pixbuf/io-gdip-jpeg.c
+++ b/gdk-pixbuf/io-gdip-jpeg.c
@@ -24,10 +24,6 @@
 #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 16d11a5..8b094bf 100644
--- a/gdk-pixbuf/io-gdip-png.c
+++ b/gdk-pixbuf/io-gdip-png.c
@@ -24,10 +24,6 @@
 #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 2edd081..7e0a189 100644
--- a/gdk-pixbuf/io-gdip-tiff.c
+++ b/gdk-pixbuf/io-gdip-tiff.c
@@ -23,10 +23,6 @@
 
 #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 3a5f1d5..3c89d4a 100644
--- a/gdk-pixbuf/io-gdip-wmf.c
+++ b/gdk-pixbuf/io-gdip-wmf.c
@@ -23,10 +23,6 @@
 
 #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 45ac135..0b370ee 100644
--- a/gdk-pixbuf/io-gif.c
+++ b/gdk-pixbuf/io-gif.c
@@ -60,10 +60,6 @@
 #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 6f5cb53..00cdc50 100644
--- a/gdk-pixbuf/io-icns.c
+++ b/gdk-pixbuf/io-icns.c
@@ -29,10 +29,6 @@
 #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 2eaa6e7..da00d1c 100644
--- a/gdk-pixbuf/io-ico.c
+++ b/gdk-pixbuf/io-ico.c
@@ -44,10 +44,6 @@ 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 affb955..72046c6 100644
--- a/gdk-pixbuf/io-jasper.c
+++ b/gdk-pixbuf/io-jasper.c
@@ -25,10 +25,6 @@
 
 #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 a33e543..c41914d 100644
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -36,10 +36,6 @@
 #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 3208918..a36f399 100644
--- a/gdk-pixbuf/io-pcx.c
+++ b/gdk-pixbuf/io-pcx.c
@@ -26,10 +26,6 @@
 #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 ef46e63..79c81fd 100644
--- a/gdk-pixbuf/io-png.c
+++ b/gdk-pixbuf/io-png.c
@@ -29,10 +29,6 @@
 #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 c2a154c..b15aa91 100644
--- a/gdk-pixbuf/io-pnm.c
+++ b/gdk-pixbuf/io-pnm.c
@@ -29,10 +29,6 @@
 #include <setjmp.h>
 #include "gdk-pixbuf-private.h"
 
-#ifdef INCLUDE_pnm
-#include "gdk-pixbuf-alias.h"
-#endif
-
 #define PNM_BUF_SIZE 4096
 
 #define PNM_FATAL_ERR  -1
diff --git a/gdk-pixbuf/io-qtif.c b/gdk-pixbuf/io-qtif.c
index ef74e0d..6672640 100644
--- a/gdk-pixbuf/io-qtif.c
+++ b/gdk-pixbuf/io-qtif.c
@@ -34,10 +34,6 @@
 #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 db0763f..ee79f1a 100644
--- a/gdk-pixbuf/io-ras.c
+++ b/gdk-pixbuf/io-ras.c
@@ -39,10 +39,6 @@ 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 113d5ea..5ef14fa 100644
--- a/gdk-pixbuf/io-tga.c
+++ b/gdk-pixbuf/io-tga.c
@@ -37,10 +37,6 @@
 
 #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 80e6938..49eea89 100644
--- a/gdk-pixbuf/io-tiff.c
+++ b/gdk-pixbuf/io-tiff.c
@@ -37,10 +37,6 @@
 #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 a882d04..e961322 100644
--- a/gdk-pixbuf/io-wbmp.c
+++ b/gdk-pixbuf/io-wbmp.c
@@ -37,10 +37,6 @@ 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 32bf295..46653b9 100644
--- a/gdk-pixbuf/io-xbm.c
+++ b/gdk-pixbuf/io-xbm.c
@@ -40,10 +40,6 @@
 #include "gdk-pixbuf-private.h"
 #include <glib/gstdio.h>
 
-#ifdef INCLUDE_xbm
-#include "gdk-pixbuf-alias.h"
-#endif
-
 
 
 
diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c
index 558609e..d65d942 100644
--- a/gdk-pixbuf/io-xpm.c
+++ b/gdk-pixbuf/io-xpm.c
@@ -35,10 +35,6 @@
 #include "gdk-pixbuf-private.h"
 #include <glib/gstdio.h>
 
-#ifdef INCLUDE_xpm
-#include "gdk-pixbuf-alias.h"
-#endif
-
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]