gtk+ r20188 - trunk/gdk-pixbuf

[mitch svn gnome org]

Author: mitch
Date: Tue May 27 12:05:14 2008
New Revision: 20188
URL: http://svn.gnome.org/viewvc/gtk+?rev=20188&view=rev

Log:
2008-05-27  Michael Natterer  <mitch imendio com>

	Fix and simplify definition of GDK_PIXBUF_VAR:

	* Makefile.am: add -DGDK_PIXBUF_COMPILATION to INCLUDES.

	* gdk-pixbuf.c: don't #define it here. Remove GDK_PIXBUF_VAR from
	the definition of the version variables.

	* gdk-pixbuf-features.h.in: in the !G_PLATFORM_WIN32 case, always
	define GDK_PIXBUF_VAR to "extern". Remove redundant #ifndef
	GDK_PIXBUF_VAR around the whole block, the header itself already
	has include guards.



Modified:
   trunk/gdk-pixbuf/ChangeLog
   trunk/gdk-pixbuf/Makefile.am
   trunk/gdk-pixbuf/gdk-pixbuf-features.h.in
   trunk/gdk-pixbuf/gdk-pixbuf.c

Modified: trunk/gdk-pixbuf/Makefile.am
==============================================================================
--- trunk/gdk-pixbuf/Makefile.am	(original)
+++ trunk/gdk-pixbuf/Makefile.am	Tue May 27 12:05:14 2008
@@ -500,6 +500,7 @@
 DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la
 INCLUDES = \
 	-DG_LOG_DOMAIN=\"GdkPixbuf\"		\
+	-DGDK_PIXBUF_COMPILATION		\
 	-I$(top_srcdir) -I$(top_builddir) 	\
 	-I$(top_srcdir)/gdk-pixbuf 		\
 	-I$(top_builddir)/gdk-pixbuf 		\

Modified: trunk/gdk-pixbuf/gdk-pixbuf-features.h.in
==============================================================================
--- trunk/gdk-pixbuf/gdk-pixbuf-features.h.in	(original)
+++ trunk/gdk-pixbuf/gdk-pixbuf-features.h.in	Tue May 27 12:05:14 2008
@@ -9,33 +9,27 @@
 /* We prefix variable declarations so they can
  * properly get exported/imported from Windows DLLs.
  */
-#ifndef GDK_PIXBUF_VAR
-#  ifdef G_PLATFORM_WIN32
-#    ifdef GDK_PIXBUF_STATIC_COMPILATION
-#      define GDK_PIXBUF_VAR extern
-#    else /* !GDK_PIXBUF_STATIC_COMPILATION */
-#      ifdef GDK_PIXBUF_COMPILATION
-#        ifdef DLL_EXPORT
-#          define GDK_PIXBUF_VAR __declspec(dllexport)
-#        else /* !DLL_EXPORT */
-#          define GDK_PIXBUF_VAR extern
-#        endif /* !DLL_EXPORT */
-#      else /* !GDK_PIXBUF_COMPILATION */
-#        define GDK_PIXBUF_VAR extern __declspec(dllimport)
-#      endif /* !GDK_PIXBUF_COMPILATION */
-#    endif /* !GDK_PIXBUF_STATIC_COMPILATION */
-#  else /* !G_PLATFORM_WIN32 */
-#    ifndef GDK_PIXBUF_COMPILATION
-#      define GDK_PIXBUF_VAR extern
-#    else
-#      define GDK_PIXBUF_VAR
+#ifdef G_PLATFORM_WIN32
+#  ifdef GDK_PIXBUF_STATIC_COMPILATION
+#    define GDK_PIXBUF_VAR extern
+#  else /* !GDK_PIXBUF_STATIC_COMPILATION */
+#    ifdef GDK_PIXBUF_COMPILATION
+#      ifdef DLL_EXPORT
+#        define GDK_PIXBUF_VAR __declspec(dllexport)
+#      else /* !DLL_EXPORT */
+#        define GDK_PIXBUF_VAR extern
+#      endif /* !DLL_EXPORT */
+#    else /* !GDK_PIXBUF_COMPILATION */
+#      define GDK_PIXBUF_VAR extern __declspec(dllimport)
 #    endif /* !GDK_PIXBUF_COMPILATION */
-#  endif /* !G_PLATFORM_WIN32 */
-#endif /* GDK_PIXBUF_VAR */
+#  endif /* !GDK_PIXBUF_STATIC_COMPILATION */
+#else /* !G_PLATFORM_WIN32 */
+#  define GDK_PIXBUF_VAR extern
+#endif /* !G_PLATFORM_WIN32 */
 
 GDK_PIXBUF_VAR const guint gdk_pixbuf_major_version;
 GDK_PIXBUF_VAR const guint gdk_pixbuf_minor_version;
 GDK_PIXBUF_VAR const guint gdk_pixbuf_micro_version;
 GDK_PIXBUF_VAR const char *gdk_pixbuf_version;
 
-#endif
+#endif /* GDK_PIXBUF_FEATURES_H */

Modified: trunk/gdk-pixbuf/gdk-pixbuf.c
==============================================================================
--- trunk/gdk-pixbuf/gdk-pixbuf.c	(original)
+++ trunk/gdk-pixbuf/gdk-pixbuf.c	Tue May 27 12:05:14 2008
@@ -27,7 +27,6 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#define GDK_PIXBUF_COMPILATION
 #include "gdk-pixbuf.h"
 #include "gdk-pixbuf-private.h"
 /* Include the marshallers */
@@ -508,11 +507,11 @@
 
 
 /* General initialization hooks */
-GDK_PIXBUF_VAR const guint gdk_pixbuf_major_version = GDK_PIXBUF_MAJOR;
-GDK_PIXBUF_VAR const guint gdk_pixbuf_minor_version = GDK_PIXBUF_MINOR;
-GDK_PIXBUF_VAR const guint gdk_pixbuf_micro_version = GDK_PIXBUF_MICRO;
+const guint gdk_pixbuf_major_version = GDK_PIXBUF_MAJOR;
+const guint gdk_pixbuf_minor_version = GDK_PIXBUF_MINOR;
+const guint gdk_pixbuf_micro_version = GDK_PIXBUF_MICRO;
 
-GDK_PIXBUF_VAR const char *gdk_pixbuf_version = GDK_PIXBUF_VERSION;
+const char *gdk_pixbuf_version = GDK_PIXBUF_VERSION;
 
 /* Error quark */
 GQuark