From db2168890834e3284de64b6a1a08f88417feda31 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 4 Jun 2010 19:40:43 -0400 Subject: [PATCH] Remove remaining single-include guards --- gdk-pixbuf/gdk-pixbuf-enum-types.h.template | 2 +- gdk-pixbuf/gdk-pixbuf-features.h.in | 2 +- gdk/gdkdevice.h | 2 +- gdk/gdkdeviceprivate.h | 4 ---- gdk/gdkenumtypes.h.template | 2 +- gtk/gtktypebuiltins.h.template | 2 +- gtk/gtkversion.h.in | 2 +- 7 files changed, 6 insertions(+), 10 deletions(-) diff --git a/gdk-pixbuf/gdk-pixbuf-enum-types.h.template b/gdk-pixbuf/gdk-pixbuf-enum-types.h.template index 4ecb7161da..3989980b03 100644 --- a/gdk-pixbuf/gdk-pixbuf-enum-types.h.template +++ b/gdk-pixbuf/gdk-pixbuf-enum-types.h.template @@ -1,5 +1,5 @@ /*** BEGIN file-header ***/ -#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION) +#if !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION) #error "Only can be included directly." #endif diff --git a/gdk-pixbuf/gdk-pixbuf-features.h.in b/gdk-pixbuf/gdk-pixbuf-features.h.in index ea1674d577..ec5f647ed0 100644 --- a/gdk-pixbuf/gdk-pixbuf-features.h.in +++ b/gdk-pixbuf/gdk-pixbuf-features.h.in @@ -1,4 +1,4 @@ -#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION) +#if !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION) #error "Only can be included directly." #endif diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h index dfbf48aef3..b2a5db8da5 100644 --- a/gdk/gdkdevice.h +++ b/gdk/gdkdevice.h @@ -17,7 +17,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #error "Only can be included directly." #endif diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h index 15f0546954..8a804e0abc 100644 --- a/gdk/gdkdeviceprivate.h +++ b/gdk/gdkdeviceprivate.h @@ -17,10 +17,6 @@ * Boston, MA 02111-1307, USA. */ -#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." -#endif - #ifndef __GDK_DEVICE_PRIVATE_H__ #define __GDK_DEVICE_PRIVATE_H__ diff --git a/gdk/gdkenumtypes.h.template b/gdk/gdkenumtypes.h.template index 85487f47f4..7475ee82f3 100644 --- a/gdk/gdkenumtypes.h.template +++ b/gdk/gdkenumtypes.h.template @@ -1,5 +1,5 @@ /*** BEGIN file-header ***/ -#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #error "Only can be included directly." #endif diff --git a/gtk/gtktypebuiltins.h.template b/gtk/gtktypebuiltins.h.template index 9b2538dc13..ae41837486 100644 --- a/gtk/gtktypebuiltins.h.template +++ b/gtk/gtktypebuiltins.h.template @@ -1,5 +1,5 @@ /*** BEGIN file-header ***/ -#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only can be included directly." #endif diff --git a/gtk/gtkversion.h.in b/gtk/gtkversion.h.in index 9db6268840..e82f9c7886 100644 --- a/gtk/gtkversion.h.in +++ b/gtk/gtkversion.h.in @@ -24,7 +24,7 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only can be included directly." #endif