From e0aa9d8a6135d404fe1ff60ba6858599e85edf98 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 5 May 2008 15:02:15 +0000 Subject: [PATCH] #define __GLIB_H_INSIDE__ around including everything. 2008-05-05 Michael Natterer * 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 instead of svn path=/trunk/; revision=6875 --- ChangeLog | 11 +++++++++++ glib/galloca.h | 2 +- glib/garray.h | 2 +- glib/gasyncqueue.h | 2 +- glib/gatomic.h | 2 +- glib/gbacktrace.h | 2 +- glib/gbase64.h | 2 +- glib/gbookmarkfile.h | 2 +- glib/gcache.h | 2 +- glib/gchecksum.h | 2 +- glib/gcompletion.h | 2 +- glib/gconvert.h | 2 +- glib/gdataset.h | 2 +- glib/gdatasetprivate.h | 2 +- glib/gdate.h | 2 +- glib/gdir.h | 2 +- glib/gerror.h | 2 +- glib/gfileutils.h | 2 +- glib/ghash.h | 2 +- glib/ghook.h | 2 +- glib/giochannel.h | 2 +- glib/gkeyfile.h | 2 +- glib/glib.h | 4 ++++ glib/glist.h | 2 +- glib/gmacros.h | 2 +- glib/gmain.h | 2 +- glib/gmappedfile.h | 2 +- glib/gmarkup.h | 2 +- glib/gmem.h | 2 +- glib/gmessages.h | 2 +- glib/gnode.h | 2 +- glib/goption.h | 2 +- glib/gpattern.h | 2 +- glib/gprimes.h | 2 +- glib/gqsort.h | 2 +- glib/gquark.h | 2 +- glib/gqueue.h | 2 +- glib/grand.h | 2 +- glib/gregex.h | 2 +- glib/grel.h | 2 +- glib/gscanner.h | 2 +- glib/gsequence.h | 2 +- glib/gshell.h | 2 +- glib/gslice.h | 2 +- glib/gslist.h | 2 +- glib/gspawn.h | 2 +- glib/gstrfuncs.h | 2 +- glib/gstring.h | 2 +- glib/gtestutils.h | 2 +- glib/gthread.h | 2 +- glib/gthreadpool.h | 2 +- glib/gtimer.h | 2 +- glib/gtree.h | 2 +- glib/gtypes.h | 2 +- glib/gunicode.h | 2 +- glib/gurifuncs.h | 2 +- glib/gutils.h | 2 +- glib/gwin32.h | 2 +- 58 files changed, 71 insertions(+), 56 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb0d7ee4..3bc224ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-05-05 Michael Natterer + + * 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 instead of + + 2008-05-02 13:24:13 Tim Janik * glib/gmain.c: renamed GMainDispatch.dispatching_sources to be more diff --git a/glib/galloca.h b/glib/galloca.h index 34c75e61..356587ff 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 can be included directly." #endif diff --git a/glib/garray.h b/glib/garray.h index d9b8b067..db001370 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 can be included directly." #endif diff --git a/glib/gasyncqueue.h b/glib/gasyncqueue.h index ef1b1149..9da43e36 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 can be included directly." #endif diff --git a/glib/gatomic.h b/glib/gatomic.h index 58e55d2f..232247bf 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 can be included directly." #endif diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h index 8e7015dc..740ee55f 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 can be included directly." #endif diff --git a/glib/gbase64.h b/glib/gbase64.h index 8bf093c6..63f08a4b 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 can be included directly." #endif diff --git a/glib/gbookmarkfile.h b/glib/gbookmarkfile.h index 8dd4ec17..bdf97c09 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 can be included directly." #endif diff --git a/glib/gcache.h b/glib/gcache.h index 3ee3aa39..283783db 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 can be included directly." #endif diff --git a/glib/gchecksum.h b/glib/gchecksum.h index 39e6679d..7df3db4d 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 can be included directly." #endif diff --git a/glib/gcompletion.h b/glib/gcompletion.h index 95d79381..900883ee 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 can be included directly." #endif diff --git a/glib/gconvert.h b/glib/gconvert.h index 15edb351..4d767841 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 can be included directly." #endif diff --git a/glib/gdataset.h b/glib/gdataset.h index 3f4ee0a9..2733ffb0 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 can be included directly." #endif diff --git a/glib/gdatasetprivate.h b/glib/gdatasetprivate.h index 9397c60a..1ebbd138 100644 --- a/glib/gdatasetprivate.h +++ b/glib/gdatasetprivate.h @@ -28,7 +28,7 @@ #ifndef __G_DATASETPRIVATE_H__ #define __G_DATASETPRIVATE_H__ -#include +#include G_BEGIN_DECLS diff --git a/glib/gdate.h b/glib/gdate.h index dcbf7fea..cb1f5661 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 can be included directly." #endif diff --git a/glib/gdir.h b/glib/gdir.h index b668115c..85e98969 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 can be included directly." #endif diff --git a/glib/gerror.h b/glib/gerror.h index dc36fb30..cd5aa246 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 can be included directly." #endif diff --git a/glib/gfileutils.h b/glib/gfileutils.h index e6088e2a..9a4b2af3 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 can be included directly." #endif diff --git a/glib/ghash.h b/glib/ghash.h index a4b7dd86..afdd0729 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 can be included directly." #endif diff --git a/glib/ghook.h b/glib/ghook.h index dbcb29a3..5577fc3e 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 can be included directly." #endif diff --git a/glib/giochannel.h b/glib/giochannel.h index 9a5a5b11..37372c4e 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 can be included directly." #endif diff --git a/glib/gkeyfile.h b/glib/gkeyfile.h index c874013a..b19124c3 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 can be included directly." #endif diff --git a/glib/glib.h b/glib/glib.h index b2941da2..ab283a0b 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 #include #include @@ -85,4 +87,6 @@ #include #endif +#undef __GLIB_H_INSIDE__ + #endif /* __G_LIB_H__ */ diff --git a/glib/glist.h b/glib/glist.h index 4a5dd65c..e74ed96f 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 can be included directly." #endif diff --git a/glib/gmacros.h b/glib/gmacros.h index ad52ebb4..01650a04 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 can be included directly." #endif diff --git a/glib/gmain.h b/glib/gmain.h index 6d400b29..f0e3ee9c 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 can be included directly." #endif diff --git a/glib/gmappedfile.h b/glib/gmappedfile.h index ffc1a942..d27c4aad 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 can be included directly." #endif diff --git a/glib/gmarkup.h b/glib/gmarkup.h index 70b82c0f..0a0b3d7b 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 can be included directly." #endif diff --git a/glib/gmem.h b/glib/gmem.h index 2bea1531..8cb050ee 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 can be included directly." #endif diff --git a/glib/gmessages.h b/glib/gmessages.h index 05fc37d2..af5a826f 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 can be included directly." #endif diff --git a/glib/gnode.h b/glib/gnode.h index 9a15e0ea..f68e8b3c 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 can be included directly." #endif diff --git a/glib/goption.h b/glib/goption.h index d678e97b..86fc0cd5 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 can be included directly." #endif diff --git a/glib/gpattern.h b/glib/gpattern.h index cbbea9cd..b653d713 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 can be included directly." #endif diff --git a/glib/gprimes.h b/glib/gprimes.h index 46e9f937..af572860 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 can be included directly." #endif diff --git a/glib/gqsort.h b/glib/gqsort.h index 75987d73..3a47a584 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 can be included directly." #endif diff --git a/glib/gquark.h b/glib/gquark.h index d061eba1..a0cbe2fd 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 can be included directly." #endif diff --git a/glib/gqueue.h b/glib/gqueue.h index afadfecd..e78488fb 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 can be included directly." #endif diff --git a/glib/grand.h b/glib/grand.h index fd2847ec..07907dfc 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 can be included directly." #endif diff --git a/glib/gregex.h b/glib/gregex.h index 82080bd0..a96fbda5 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 can be included directly." #endif diff --git a/glib/grel.h b/glib/grel.h index bec15e3a..e7c92913 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 can be included directly." #endif diff --git a/glib/gscanner.h b/glib/gscanner.h index e85ac97d..3b7ad6fa 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 can be included directly." #endif diff --git a/glib/gsequence.h b/glib/gsequence.h index b301dcf4..fa79066e 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 can be included directly." #endif diff --git a/glib/gshell.h b/glib/gshell.h index 680eae99..130f1008 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 can be included directly." #endif diff --git a/glib/gslice.h b/glib/gslice.h index 12f79762..f9cc6442 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 can be included directly." #endif diff --git a/glib/gslist.h b/glib/gslist.h index 8619f834..8b01faf5 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 can be included directly." #endif diff --git a/glib/gspawn.h b/glib/gspawn.h index 1cb57839..9836b342 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 can be included directly." #endif diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h index 18b49495..0da475b2 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 can be included directly." #endif diff --git a/glib/gstring.h b/glib/gstring.h index 6fc94b09..2b1dd6ec 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 can be included directly." #endif diff --git a/glib/gtestutils.h b/glib/gtestutils.h index 0e2ae79b..193dd1c8 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 can be included directly." #endif diff --git a/glib/gthread.h b/glib/gthread.h index 05075583..cfa12d04 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 can be included directly." #endif diff --git a/glib/gthreadpool.h b/glib/gthreadpool.h index 8179f37f..d5864241 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 can be included directly." #endif diff --git a/glib/gtimer.h b/glib/gtimer.h index 1f05c38e..743eed1f 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 can be included directly." #endif diff --git a/glib/gtree.h b/glib/gtree.h index 1d852ecb..a8bbda8d 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 can be included directly." #endif diff --git a/glib/gtypes.h b/glib/gtypes.h index 9e7ea760..1e6b4273 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 can be included directly." #endif diff --git a/glib/gunicode.h b/glib/gunicode.h index 7a032f31..78b259e4 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 can be included directly." #endif diff --git a/glib/gurifuncs.h b/glib/gurifuncs.h index 78a1b914..bcdeed97 100644 --- a/glib/gurifuncs.h +++ b/glib/gurifuncs.h @@ -20,7 +20,7 @@ * Author: Alexander Larsson */ -#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 can be included directly." #endif diff --git a/glib/gutils.h b/glib/gutils.h index 67441304..0c0d0f8d 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 can be included directly." #endif diff --git a/glib/gwin32.h b/glib/gwin32.h index afef55be..5a58b6e7 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 can be included directly." #endif -- 2.34.1