callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix and simplify definition of GDK_PIXBUF_VAR:

Browse Source 
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.


svn path=/trunk/; revision=20188
This commit is contained in:
Michael Natterer
2008-05-27 12:05:14 +00:00
committed by Michael Natterer
parent 727a7dbf46
commit f498fc887f
4 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gdk-pixbuf/ChangeLog
View File

@ -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

1
gdk-pixbuf/Makefile.am
View File

@ -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 \

40
gdk-pixbuf/gdk-pixbuf-features.h.in
View File

@ -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 */

9
gdk-pixbuf/gdk-pixbuf.c
View File

@ -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