gtk+ r20189 - trunk/gdk-pixbuf

[mitch svn gnome org]

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

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

	* gdk-pixbuf.c: put back the #define, but call it
	GDK_PIXBUF_C_COMPILATION.

	* gdk-pixbuf-features.h.in: make variable export depend on that
	define instead of GDK_PIXBUF_COMPILATION.



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

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:50:45 2008
@@ -13,15 +13,15 @@
 #  ifdef GDK_PIXBUF_STATIC_COMPILATION
 #    define GDK_PIXBUF_VAR extern
 #  else /* !GDK_PIXBUF_STATIC_COMPILATION */
-#    ifdef GDK_PIXBUF_COMPILATION
+#    ifdef GDK_PIXBUF_C_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 */
+#    else /* !GDK_PIXBUF_C_COMPILATION */
 #      define GDK_PIXBUF_VAR extern __declspec(dllimport)
-#    endif /* !GDK_PIXBUF_COMPILATION */
+#    endif /* !GDK_PIXBUF_C_COMPILATION */
 #  endif /* !GDK_PIXBUF_STATIC_COMPILATION */
 #else /* !G_PLATFORM_WIN32 */
 #  define GDK_PIXBUF_VAR extern

Modified: trunk/gdk-pixbuf/gdk-pixbuf.c
==============================================================================
--- trunk/gdk-pixbuf/gdk-pixbuf.c	(original)
+++ trunk/gdk-pixbuf/gdk-pixbuf.c	Tue May 27 12:50:45 2008
@@ -27,6 +27,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
+#define GDK_PIXBUF_C_COMPILATION
 #include "gdk-pixbuf.h"
 #include "gdk-pixbuf-private.h"
 /* Include the marshallers */