put back the #define, but call it GDK_PIXBUF_C_COMPILATION.

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.

svn path=/trunk/; revision=20189

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index be06ecf75ee8ec48dc90064d141a53be38bc073b..9753b11221559d013aa77566a2aab84bcf411e61 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2008-05-27  Michael Natterer  <mitch@imendio.com>
 
        Fix and simplify definition of GDK_PIXBUF_VAR:

diff --git a/gdk-pixbuf/gdk-pixbuf-features.h.in b/gdk-pixbuf/gdk-pixbuf-features.h.in
index e1e28f95e856ac05a479600f235ef30f030eb466..40f946a117adf4f9ece0a4d8ba3dbea81fbaf98c 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-features.h.in
+++ b/gdk-pixbuf/gdk-pixbuf-features.h.in
@@ -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

diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c
index 6aaffcd977a52df703a8dfbdd3e0e3c58f8e9a50..5fc1ca3fb8f67d92d2afd915f597581706a4137b 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf.c
+++ b/gdk-pixbuf/gdk-pixbuf.c
@@ -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 */