diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-05-27 12:05:14 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-05-27 12:05:14 +0000 |
| commit | 54df168e89d3709e87e9141f1c1bd0f111876b92 (patch) | |
| tree | 643fb61240c95a288592ac45d1716234767283f7 /gdk-pixbuf/gdk-pixbuf-features.h.in | |
| parent | 8fc95e4364602002d1f5a1b10b7343d93c1b68d2 (diff) | |
| download | gdk-pixbuf-54df168e89d3709e87e9141f1c1bd0f111876b92.tar.gz | |
Fix and simplify definition of GDK_PIXBUF_VAR:
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
Diffstat (limited to 'gdk-pixbuf/gdk-pixbuf-features.h.in')
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-features.h.in | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-features.h.in b/gdk-pixbuf/gdk-pixbuf-features.h.in index 87eab582a..e1e28f95e 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 */ |