From 4449e5032c960e324604ea1b8e482b83c5ad429a Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 27 May 2008 12:50:45 +0000 Subject: [PATCH] put back the #define, but call it GDK_PIXBUF_C_COMPILATION. 2008-05-27 Michael Natterer * 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 --- gdk-pixbuf/ChangeLog | 8 ++++++++ gdk-pixbuf/gdk-pixbuf-features.h.in | 6 +++--- gdk-pixbuf/gdk-pixbuf.c | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index be06ecf75e..9753b11221 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,11 @@ +2008-05-27 Michael Natterer + + * 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 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 e1e28f95e8..40f946a117 100644 --- 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 6aaffcd977..5fc1ca3fb8 100644 --- a/gdk-pixbuf/gdk-pixbuf.c +++ b/gdk-pixbuf/gdk-pixbuf.c @@ -27,6 +27,7 @@ #include #include #include +#define GDK_PIXBUF_C_COMPILATION #include "gdk-pixbuf.h" #include "gdk-pixbuf-private.h" /* Include the marshallers */