diff options
58 files changed, 71 insertions, 56 deletions
@@ -1,3 +1,14 @@ +2008-05-05 Michael Natterer <mitch@imendio.com> + + * glib/glib.h: #define __GLIB_H_INSIDE__ around including + everything. + + * glib/*.h: check for that define instead of __G_LIB_H__ if + G_DISABLE_SINGLE_INCLUDES is defined. + + * glib/gdatasetprivate.h: #include <glib.h> instead of + <glib/gdataset.h> + 2008-05-02 13:24:13 Tim Janik <timj@imendio.com> * glib/gmain.c: renamed GMainDispatch.dispatching_sources to be more diff --git a/glib/galloca.h b/glib/galloca.h index 34c75e61f..356587ff6 100644 --- a/glib/galloca.h +++ b/glib/galloca.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/garray.h b/glib/garray.h index d9b8b0674..db001370a 100644 --- a/glib/garray.h +++ b/glib/garray.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gasyncqueue.h b/glib/gasyncqueue.h index ef1b11490..9da43e36d 100644 --- a/glib/gasyncqueue.h +++ b/glib/gasyncqueue.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gatomic.h b/glib/gatomic.h index 58e55d2ff..232247bf4 100644 --- a/glib/gatomic.h +++ b/glib/gatomic.h @@ -27,7 +27,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h index 8e7015dc3..740ee55f9 100644 --- a/glib/gbacktrace.h +++ b/glib/gbacktrace.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gbase64.h b/glib/gbase64.h index 8bf093c60..63f08a4b7 100644 --- a/glib/gbase64.h +++ b/glib/gbase64.h @@ -18,7 +18,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gbookmarkfile.h b/glib/gbookmarkfile.h index 8dd4ec17c..bdf97c09f 100644 --- a/glib/gbookmarkfile.h +++ b/glib/gbookmarkfile.h @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gcache.h b/glib/gcache.h index 3ee3aa398..283783dbb 100644 --- a/glib/gcache.h +++ b/glib/gcache.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gchecksum.h b/glib/gchecksum.h index 39e6679d5..7df3db4df 100644 --- a/glib/gchecksum.h +++ b/glib/gchecksum.h @@ -18,7 +18,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gcompletion.h b/glib/gcompletion.h index 95d793819..900883eef 100644 --- a/glib/gcompletion.h +++ b/glib/gcompletion.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gconvert.h b/glib/gconvert.h index 15edb3512..4d767841d 100644 --- a/glib/gconvert.h +++ b/glib/gconvert.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gdataset.h b/glib/gdataset.h index 3f4ee0a9e..2733ffb03 100644 --- a/glib/gdataset.h +++ b/glib/gdataset.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gdatasetprivate.h b/glib/gdatasetprivate.h index 9397c60aa..1ebbd1385 100644 --- a/glib/gdatasetprivate.h +++ b/glib/gdatasetprivate.h @@ -28,7 +28,7 @@ #ifndef __G_DATASETPRIVATE_H__ #define __G_DATASETPRIVATE_H__ -#include <glib/gdataset.h> +#include <glib.h> G_BEGIN_DECLS diff --git a/glib/gdate.h b/glib/gdate.h index dcbf7fea9..cb1f56615 100644 --- a/glib/gdate.h +++ b/glib/gdate.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gdir.h b/glib/gdir.h index b668115ce..85e989695 100644 --- a/glib/gdir.h +++ b/glib/gdir.h @@ -21,7 +21,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gerror.h b/glib/gerror.h index dc36fb303..cd5aa246e 100644 --- a/glib/gerror.h +++ b/glib/gerror.h @@ -18,7 +18,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gfileutils.h b/glib/gfileutils.h index e6088e2a4..9a4b2af38 100644 --- a/glib/gfileutils.h +++ b/glib/gfileutils.h @@ -18,7 +18,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/ghash.h b/glib/ghash.h index a4b7dd861..afdd07297 100644 --- a/glib/ghash.h +++ b/glib/ghash.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/ghook.h b/glib/ghook.h index dbcb29a37..5577fc3e2 100644 --- a/glib/ghook.h +++ b/glib/ghook.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/giochannel.h b/glib/giochannel.h index 9a5a5b116..37372c4e5 100644 --- a/glib/giochannel.h +++ b/glib/giochannel.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gkeyfile.h b/glib/gkeyfile.h index c874013a1..b19124c35 100644 --- a/glib/gkeyfile.h +++ b/glib/gkeyfile.h @@ -20,7 +20,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/glib.h b/glib/glib.h index b2941da20..ab283a0b8 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -27,6 +27,8 @@ #ifndef __G_LIB_H__ #define __G_LIB_H__ +#define __GLIB_H_INSIDE__ + #include <glib/galloca.h> #include <glib/garray.h> #include <glib/gasyncqueue.h> @@ -85,4 +87,6 @@ #include <glib/gwin32.h> #endif +#undef __GLIB_H_INSIDE__ + #endif /* __G_LIB_H__ */ diff --git a/glib/glist.h b/glib/glist.h index 4a5dd65c7..e74ed96f1 100644 --- a/glib/glist.h +++ b/glib/glist.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gmacros.h b/glib/gmacros.h index ad52ebb43..01650a04d 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -28,7 +28,7 @@ * not refer to variables from glibconfig.h */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gmain.h b/glib/gmain.h index 6d400b291..f0e3ee9cd 100644 --- a/glib/gmain.h +++ b/glib/gmain.h @@ -17,7 +17,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gmappedfile.h b/glib/gmappedfile.h index ffc1a9423..d27c4aada 100644 --- a/glib/gmappedfile.h +++ b/glib/gmappedfile.h @@ -19,7 +19,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gmarkup.h b/glib/gmarkup.h index 70b82c0f3..0a0b3d7b7 100644 --- a/glib/gmarkup.h +++ b/glib/gmarkup.h @@ -18,7 +18,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gmem.h b/glib/gmem.h index 2bea15313..8cb050ee3 100644 --- a/glib/gmem.h +++ b/glib/gmem.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gmessages.h b/glib/gmessages.h index 05fc37d2f..af5a826f8 100644 --- a/glib/gmessages.h +++ b/glib/gmessages.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gnode.h b/glib/gnode.h index 9a15e0eab..f68e8b3cc 100644 --- a/glib/gnode.h +++ b/glib/gnode.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/goption.h b/glib/goption.h index d678e97b0..86fc0cd5d 100644 --- a/glib/goption.h +++ b/glib/goption.h @@ -18,7 +18,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gpattern.h b/glib/gpattern.h index cbbea9cd4..b653d713f 100644 --- a/glib/gpattern.h +++ b/glib/gpattern.h @@ -17,7 +17,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gprimes.h b/glib/gprimes.h index 46e9f9376..af5728602 100644 --- a/glib/gprimes.h +++ b/glib/gprimes.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gqsort.h b/glib/gqsort.h index 75987d732..3a47a584e 100644 --- a/glib/gqsort.h +++ b/glib/gqsort.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gquark.h b/glib/gquark.h index d061eba1b..a0cbe2fd7 100644 --- a/glib/gquark.h +++ b/glib/gquark.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gqueue.h b/glib/gqueue.h index afadfecdf..e78488fb6 100644 --- a/glib/gqueue.h +++ b/glib/gqueue.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/grand.h b/glib/grand.h index fd2847ec6..07907dfc1 100644 --- a/glib/grand.h +++ b/glib/grand.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gregex.h b/glib/gregex.h index 82080bd07..a96fbda51 100644 --- a/glib/gregex.h +++ b/glib/gregex.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/grel.h b/glib/grel.h index bec15e3a2..e7c929133 100644 --- a/glib/grel.h +++ b/glib/grel.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gscanner.h b/glib/gscanner.h index e85ac97d9..3b7ad6fab 100644 --- a/glib/gscanner.h +++ b/glib/gscanner.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gsequence.h b/glib/gsequence.h index b301dcf48..fa79066e0 100644 --- a/glib/gsequence.h +++ b/glib/gsequence.h @@ -18,7 +18,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gshell.h b/glib/gshell.h index 680eae99e..130f1008c 100644 --- a/glib/gshell.h +++ b/glib/gshell.h @@ -18,7 +18,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gslice.h b/glib/gslice.h index 12f797622..f9cc64426 100644 --- a/glib/gslice.h +++ b/glib/gslice.h @@ -17,7 +17,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gslist.h b/glib/gslist.h index 8619f8341..8b01faf5c 100644 --- a/glib/gslist.h +++ b/glib/gslist.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gspawn.h b/glib/gspawn.h index 1cb578399..9836b3424 100644 --- a/glib/gspawn.h +++ b/glib/gspawn.h @@ -18,7 +18,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h index 18b494951..0da475b28 100644 --- a/glib/gstrfuncs.h +++ b/glib/gstrfuncs.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gstring.h b/glib/gstring.h index 6fc94b098..2b1dd6ece 100644 --- a/glib/gstring.h +++ b/glib/gstring.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gtestutils.h b/glib/gtestutils.h index 0e2ae79bc..193dd1c80 100644 --- a/glib/gtestutils.h +++ b/glib/gtestutils.h @@ -18,7 +18,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gthread.h b/glib/gthread.h index 050755837..cfa12d042 100644 --- a/glib/gthread.h +++ b/glib/gthread.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gthreadpool.h b/glib/gthreadpool.h index 8179f37f0..d5864241e 100644 --- a/glib/gthreadpool.h +++ b/glib/gthreadpool.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gtimer.h b/glib/gtimer.h index 1f05c38ef..743eed1f9 100644 --- a/glib/gtimer.h +++ b/glib/gtimer.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gtree.h b/glib/gtree.h index 1d852ecbc..a8bbda8d7 100644 --- a/glib/gtree.h +++ b/glib/gtree.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gtypes.h b/glib/gtypes.h index 9e7ea7600..1e6b42731 100644 --- a/glib/gtypes.h +++ b/glib/gtypes.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gunicode.h b/glib/gunicode.h index 7a032f314..78b259e44 100644 --- a/glib/gunicode.h +++ b/glib/gunicode.h @@ -19,7 +19,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gurifuncs.h b/glib/gurifuncs.h index 78a1b914d..bcdeed979 100644 --- a/glib/gurifuncs.h +++ b/glib/gurifuncs.h @@ -20,7 +20,7 @@ * Author: Alexander Larsson <alexl@redhat.com> */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gutils.h b/glib/gutils.h index 674413047..0c0d0f8d2 100644 --- a/glib/gutils.h +++ b/glib/gutils.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif diff --git a/glib/gwin32.h b/glib/gwin32.h index afef55be9..5a58b6e79 100644 --- a/glib/gwin32.h +++ b/glib/gwin32.h @@ -24,7 +24,7 @@ * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) #error "Only <glib.h> can be included directly." #endif |