diff options
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-animation.h | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-core.h | 4 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-csource.c | 2 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-enum-types.h.template | 4 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-features.h.in | 4 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-io.h | 4 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-loader.h | 4 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-private.h | 1 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-simple-anim.h | 4 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-transform.h | 4 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf.h | 3 |
11 files changed, 37 insertions, 2 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-animation.h b/gdk-pixbuf/gdk-pixbuf-animation.h index 145b24dcd..32757ee76 100644 --- a/gdk-pixbuf/gdk-pixbuf-animation.h +++ b/gdk-pixbuf/gdk-pixbuf-animation.h @@ -24,10 +24,13 @@ * 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> diff --git a/gdk-pixbuf/gdk-pixbuf-core.h b/gdk-pixbuf/gdk-pixbuf-core.h index 04f89b000..b2563809e 100644 --- a/gdk-pixbuf/gdk-pixbuf-core.h +++ b/gdk-pixbuf/gdk-pixbuf-core.h @@ -23,6 +23,10 @@ * 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 diff --git a/gdk-pixbuf/gdk-pixbuf-csource.c b/gdk-pixbuf/gdk-pixbuf-csource.c index b8c7bbffe..597815e70 100644 --- a/gdk-pixbuf/gdk-pixbuf-csource.c +++ b/gdk-pixbuf/gdk-pixbuf-csource.c @@ -18,7 +18,9 @@ */ #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> diff --git a/gdk-pixbuf/gdk-pixbuf-enum-types.h.template b/gdk-pixbuf/gdk-pixbuf-enum-types.h.template index 0df6adb1c..7cdf23376 100644 --- a/gdk-pixbuf/gdk-pixbuf-enum-types.h.template +++ b/gdk-pixbuf/gdk-pixbuf-enum-types.h.template @@ -1,4 +1,8 @@ /*** 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__ diff --git a/gdk-pixbuf/gdk-pixbuf-features.h.in b/gdk-pixbuf/gdk-pixbuf-features.h.in index 40f946a11..ea1674d57 100644 --- a/gdk-pixbuf/gdk-pixbuf-features.h.in +++ b/gdk-pixbuf/gdk-pixbuf-features.h.in @@ -1,3 +1,7 @@ +#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 diff --git a/gdk-pixbuf/gdk-pixbuf-io.h b/gdk-pixbuf/gdk-pixbuf-io.h index 3fe9226c9..b1a162f89 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.h +++ b/gdk-pixbuf/gdk-pixbuf-io.h @@ -26,6 +26,10 @@ * 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 diff --git a/gdk-pixbuf/gdk-pixbuf-loader.h b/gdk-pixbuf/gdk-pixbuf-loader.h index d9b2b7dc0..5d1f17cd1 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.h +++ b/gdk-pixbuf/gdk-pixbuf-loader.h @@ -23,6 +23,10 @@ * 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 diff --git a/gdk-pixbuf/gdk-pixbuf-private.h b/gdk-pixbuf/gdk-pixbuf-private.h index 168787589..c0220d36e 100644 --- a/gdk-pixbuf/gdk-pixbuf-private.h +++ b/gdk-pixbuf/gdk-pixbuf-private.h @@ -28,7 +28,6 @@ #define GDK_PIXBUF_PRIVATE_H #include "gdk-pixbuf.h" -#include "gdk-pixbuf-io.h" #include "gdk-pixbuf-i18n.h" #include <stdio.h> diff --git a/gdk-pixbuf/gdk-pixbuf-simple-anim.h b/gdk-pixbuf/gdk-pixbuf-simple-anim.h index d26240426..ae77c202a 100644 --- a/gdk-pixbuf/gdk-pixbuf-simple-anim.h +++ b/gdk-pixbuf/gdk-pixbuf-simple-anim.h @@ -21,6 +21,10 @@ * 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 diff --git a/gdk-pixbuf/gdk-pixbuf-transform.h b/gdk-pixbuf/gdk-pixbuf-transform.h index 6a1bb1e52..4965acf20 100644 --- a/gdk-pixbuf/gdk-pixbuf-transform.h +++ b/gdk-pixbuf/gdk-pixbuf-transform.h @@ -23,6 +23,10 @@ * 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 diff --git a/gdk-pixbuf/gdk-pixbuf.h b/gdk-pixbuf/gdk-pixbuf.h index 0d77b2bfd..9a30131fb 100644 --- a/gdk-pixbuf/gdk-pixbuf.h +++ b/gdk-pixbuf/gdk-pixbuf.h @@ -26,6 +26,8 @@ #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> @@ -38,5 +40,6 @@ #include <gdk-pixbuf/gdk-pixbuf-loader.h> #include <gdk-pixbuf/gdk-pixbuf-enum-types.h> +#undef GDK_PIXBUF_H_INSIDE #endif /* GDK_PIXBUF_H */ |