diff options
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 14 | ||||
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 1 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-features.h.in | 40 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf.c | 9 |
4 files changed, 36 insertions, 28 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 580353ea64..be06ecf75e 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,17 @@ +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. + 2008-05-12 Tor Lillqvist <tml@novell.com> Bug 532558 - Cannot build dll when using separate builddir diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index bead87b88b..b320f2996d 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -500,6 +500,7 @@ builtin_objs = @INCLUDED_LOADER_OBJ@ 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 \ diff --git a/gdk-pixbuf/gdk-pixbuf-features.h.in b/gdk-pixbuf/gdk-pixbuf-features.h.in index 87eab582a8..e1e28f95e8 100644 --- a/gdk-pixbuf/gdk-pixbuf-features.h.in +++ b/gdk-pixbuf/gdk-pixbuf-features.h.in @@ -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 */ diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c index f440baf3ac..6aaffcd977 100644 --- a/gdk-pixbuf/gdk-pixbuf.c +++ b/gdk-pixbuf/gdk-pixbuf.c @@ -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 @@ gdk_pixbuf_get_rowstride (const GdkPixbuf *pixbuf) /* 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 |