+2008-05-28 Michael Natterer <mitch@imendio.com>
+
+ * gdk-pixbuf.h: define GDK_PIXBUF_H_INSIDE around including all
+ other headers.
+
+ * gdk-pixbuf-animation.h
+ * gdk-pixbuf-core.h
+ * gdk-pixbuf-enum-types.h.template
+ * gdk-pixbuf-features.h.in
+ * gdk-pixbuf-io.h
+ * gdk-pixbuf-loader.h
+ * gdk-pixbuf-simple-anim.h
+ * gdk-pixbuf-transform.h: add single-include guards that #error
+ out if GDK_PIXBUF_DISABLE_SINGLE_INCLUDES is defined and any of
+ these files is included individually.
+
+ * gdk-pixbuf-private.h: don't incude "gdk-pixbuf-io.h".
+
+ * gdk-pixbuf-csource.c: #define __GTK_H_INSIDE__ around including
+ "../gtk/gtkversion.h". Ugly but needed in this special case.
+
2008-05-27 Tor Lillqvist <tml@novell.com>
* io-*.c: Use explicit G_MODULE_EXPORT decoration when building
* Boston, MA 02111-1307, USA.
*/
+#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
+#endif
+
#ifndef GDK_PIXBUF_ANIMATION_H
#define GDK_PIXBUF_ANIMATION_H
-#include <glib.h>
#include <glib-object.h>
#include <gdk-pixbuf/gdk-pixbuf-core.h>
* Boston, MA 02111-1307, USA.
*/
+#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
+#endif
+
#ifndef GDK_PIXBUF_CORE_H
#define GDK_PIXBUF_CORE_H
*/
#include <config.h>
+#define __GTK_H_INSIDE__
#include "../gtk/gtkversion.h" /* versioning */
+#undef __GTK_H_INSIDE__
#include "gdk-pixbuf.h"
#include "gdk-pixdata.h"
#include <glib/gprintf.h>
/*** BEGIN file-header ***/
+#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
+#endif
+
#ifndef __GDK_PIXBUF_ENUM_TYPES_H__
#define __GDK_PIXBUF_ENUM_TYPES_H__
+#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !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
* Boston, MA 02111-1307, USA.
*/
+#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
+#endif
+
#ifndef GDK_PIXBUF_IO_H
#define GDK_PIXBUF_IO_H
* Boston, MA 02111-1307, USA.
*/
+#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
+#endif
+
#ifndef GDK_PIXBUF_LOADER_H
#define GDK_PIXBUF_LOADER_H
#define GDK_PIXBUF_PRIVATE_H
#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
#include "gdk-pixbuf-i18n.h"
#include <stdio.h>
* Boston, MA 02111-1307, USA.
*/
+#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
+#endif
+
#ifndef GDK_PIXBUF_SIMPLE_ANIM_H
#define GDK_PIXBUF_SIMPLE_ANIM_H
* Boston, MA 02111-1307, USA.
*/
+#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
+#endif
+
#ifndef GDK_PIXBUF_TRANSFORM_H
#define GDK_PIXBUF_TRANSFORM_H
#ifndef GDK_PIXBUF_H
#define GDK_PIXBUF_H
+#define GDK_PIXBUF_H_INSIDE
+
#include <glib.h>
#include <gdk-pixbuf/gdk-pixbuf-features.h>
#include <glib-object.h>
#include <gdk-pixbuf/gdk-pixbuf-loader.h>
#include <gdk-pixbuf/gdk-pixbuf-enum-types.h>
+#undef GDK_PIXBUF_H_INSIDE
#endif /* GDK_PIXBUF_H */