[quartz] Delete the typedef of GdkDevicePrivate

[~andy/gtk] / gdk-pixbuf / gdk-pixbuf-features.h.in

diff --git a/gdk-pixbuf/gdk-pixbuf-features.h.in b/gdk-pixbuf/gdk-pixbuf-features.h.in
index 3aa0a5ad913e4fd24ae83a58621e89318f4915c4..ec5f647ed00ce870570661d4b88158446f541fbf 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-features.h.in
+++ b/gdk-pixbuf/gdk-pixbuf-features.h.in
@@ -1,3 +1,7 @@
+#if !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
+#endif
+
 #ifndef GDK_PIXBUF_FEATURES_H
 #define GDK_PIXBUF_FEATURES_H 1
 
@@ -9,31 +13,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
-#    endif /* !GDK_PIXBUF_COMPILATION */
-#  endif /* !G_PLATFORM_WIN32 */
-#endif /* 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_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_C_COMPILATION */
+#      define GDK_PIXBUF_VAR extern __declspec(dllimport)
+#    endif /* !GDK_PIXBUF_C_COMPILATION */
+#  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_minor_version, gdk_pixbuf_micro_version;
+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 */