Commit 4449e503 authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

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
parent f498fc88
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:
......
......@@ -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
......
......@@ -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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment