#define __GLIB_H_INSIDE__ around including everything.

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>

svn path=/trunk/; revision=6875

diff --git a/ChangeLog b/ChangeLog
index eb0d7ee472ca6570bfecf76e728a3616e91ba2bd..3bc224ecec73a5c0eacd7c1f6f4488d35b5e1003 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 34c75e61f28e78e74d48721800a7aca78b4c9875..356587ff632597e751dce67da10b0ae86f8c04fb 100644 (file)
--- 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 d9b8b0674374d9422d7f75522b5d875aa4ae4823..db001370aee9ebf17f00f4fac9b1b9147474867e 100644 (file)
--- 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 ef1b1149092557bd90da4d960f0f7ab68f6f18c9..9da43e36da0c43b82a7ea8dc5b9e74cf56eca3d8 100644 (file)
--- 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 58e55d2ff1359f534a705a8d4b0b6463e75cee5a..232247bf43af46e516e82a3b2bdd4edc434f31b3 100644 (file)
--- 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 8e7015dc3e2b16ffcf815d9ece5455d6f528afce..740ee55f908e1a0e87db343f08acdf4d82bb1a1b 100644 (file)
--- 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 8bf093c60bc42c2c3abe8af3b5d8df7498e3f198..63f08a4b735a650400b656412ab0de4c14ece718 100644 (file)
--- 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 8dd4ec17cddac285f067ae5a07a595741295e5eb..bdf97c09f634e8ae7eb33b11cb18863b755a8f57 100644 (file)
--- 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 3ee3aa3980c7b5a1f17154b789f03990b5793cd5..283783dbb64f4378ae913fc13387f341ff041f0b 100644 (file)
--- 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 39e6679d59b35442cd42919aa0a594a86cd39ac1..7df3db4df63f7e0bd58c72d583befa896ef4c35f 100644 (file)
--- 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 95d79381943d5b6703ae65ea75fcfce0ef53f01d..900883eef8eb2406b9e14892a89f2719c41857d1 100644 (file)
--- 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 15edb3512e78ea68239424d69d40691578d75c24..4d767841d15e474b27f86a7f6f0f26e43ebaa88f 100644 (file)
--- 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 3f4ee0a9eb1a0185cb90ddf749cc43712a18dd30..2733ffb0335524db02c62c170b0f041f65f45e50 100644 (file)
--- 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 9397c60aafc59f5737f63359489f415addf0765f..1ebbd13856ff577aefdd51bcd16c9d96a1947812 100644 (file)
--- 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 dcbf7fea9e1223030bcea657ebd2957308df3c15..cb1f566155ad2be112f72c5598ebcf2d9c366396 100644 (file)
--- 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 b668115ceef1ed9e3ebe44a510976774ea03f598..85e989695ab0e5335b6c1bded4a6cb2a721ca64f 100644 (file)
--- 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 dc36fb30321bc64e94cc828371edbc4188311dd2..cd5aa246e2546f473ff8263de3b6c2cd3d24c6c2 100644 (file)
--- 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 e6088e2a458db60bfe6a5954de9bb3e4258ea8a2..9a4b2af38dc01b7d64b215aa20f850bccbe28334 100644 (file)
--- 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 a4b7dd8616680a91ad5ab11bc87d18f7bc13a169..afdd0729764c8eb83e9dc7442aae03854bcc0b95 100644 (file)
--- 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 dbcb29a37af8058020087e7c1257de84a7b4b619..5577fc3e215e4a361009dc418a50c63c92e129ee 100644 (file)
--- 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 9a5a5b116cb51c8584c1db95cde9aef2a6f17b2f..37372c4e555f11e5804c4e62f13bb6cff35e3b82 100644 (file)
--- 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 c874013a1eadcce60fa538c0e8b92f217d531ef2..b19124c35d188446a5e7014f5be86bb3a3e4b448 100644 (file)
--- 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 b2941da2023d7450e51e4ab0a64b43ad68ad0025..ab283a0b8031706147f1f278b080abed30d1f347 100644 (file)
--- 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 4a5dd65c7a19f70b1ba7be0679feb1507b7f0c1b..e74ed96f15aa0656197f15374460955697c52a63 100644 (file)
--- 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 ad52ebb43b885ab64ffe0a1c6f9a733eca71455e..01650a04de8404ecdacce2c91a9a65d1ef08485b 100644 (file)
--- 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 6d400b291234eff61a5c54ac5c6f5b88de0d7443..f0e3ee9cddc2a3413e22827c4ad6bd99021c15e4 100644 (file)
--- 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 ffc1a942324ebdcd6c1044c56b6a06c20fb6ad88..d27c4aada364605701bc7482b346a76c1f3395a2 100644 (file)
--- 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 70b82c0f31ef97a2b6c0b8b04f06d4b7aacafe40..0a0b3d7b701e7bcc595660108ffaac16b356109e 100644 (file)
--- 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 2bea153131471975b26e1269cb83f6716a9c1d89..8cb050ee3724b12f47f3a775fa5ce04356d32afc 100644 (file)
--- 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 05fc37d2fa016e2df13171b7e6b3b65423a595de..af5a826f8f7fcee08ff0d75d813d8159b2aa0cab 100644 (file)
--- 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 9a15e0eab51cd36f78fc786cb370cb5832e04a7b..f68e8b3cc803c712f8192f3dafe869d45260d48a 100644 (file)
--- 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 d678e97b0213ce703bcf053e7c637602df8271a7..86fc0cd5d4a6ec8f1ec8c847e8058becbcb6feee 100644 (file)
--- 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 cbbea9cd4f598247a4aed4e2b03a0c390f4cd2bd..b653d713f080f31c93497f2785acc9fb62c6b4c7 100644 (file)
--- 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 46e9f9376e3b2d3e9fc9db427389fa0bbbb3451b..af5728602baac2ee683be0ce362af2ef8e559773 100644 (file)
--- 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 75987d7322f382b7f2ddf18b8e54ad1b88b55bb0..3a47a584ee6269a7e9bdafd08b123b8b06bea1af 100644 (file)
--- 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 d061eba1bed79a5364c71718f8345fbdd6dde476..a0cbe2fd72c8c6c97f16e6a806ec8ec62781cb49 100644 (file)
--- 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 afadfecdffac039b3e3c084eeb03b74c7890d1a3..e78488fb651896827e43277a6f3abcd1d9292a9b 100644 (file)
--- 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 fd2847ec637288551959105a5695308cb671cc27..07907dfc172b014a33a40efa2a886eca60df951d 100644 (file)
--- 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 82080bd07f19164184649b9dec19446aedb64029..a96fbda51482935f7b01ac63546e79f0ab9a113a 100644 (file)
--- 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 bec15e3a2283b2fad763b6cb99ac074df5d3afb6..e7c929133795c74ef55dc22f2f34d9ae6b830aa8 100644 (file)
--- 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 e85ac97d9c3608b4ab614e4a4669a6a3d6f3cda6..3b7ad6fab0cce8871323423eb47e5c78225afe41 100644 (file)
--- 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 b301dcf4867513c0a5e669ba05810b81a9c2bd61..fa79066e0600259e8a43556638ea74537b9d091f 100644 (file)
--- 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 680eae99e96c98c3344d7514a45c253a064b897e..130f1008c8809dc21fa53615f0950474e3d23bc9 100644 (file)
--- 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 12f7976229285cb2ced228c8ad188bf65a14c8a7..f9cc644267f1cd6c146a54a14041d2c5969bc14f 100644 (file)
--- 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 8619f8341e71ae6a44dd1e8defdd724194374203..8b01faf5cd468f7161ef723a2ff85226fcdca5dd 100644 (file)
--- 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 1cb5783999b18a415bf3084434c8141d433ffbcb..9836b34242a6e8f4d91aa079ee70b249c0c429d9 100644 (file)
--- 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 18b4949515b9f9e8c0577498a1a426892e68cde3..0da475b287fe03f5bed695697385ab3fdb182149 100644 (file)
--- 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 6fc94b098db0ec9dc40450bdcd6e4c489463a645..2b1dd6ece2cf08dada14f1403b6de495bb3ade1e 100644 (file)
--- 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 0e2ae79bc1c3bf4faa214ad3961dc4063f38ec84..193dd1c801295d1090ff153bdbc2521718c4b754 100644 (file)
--- 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 05075583739cbc4e3cc72d7cb0cdd33cc2457afc..cfa12d042a3129b1929ffcb77c8fcc1a8945b9e7 100644 (file)
--- 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 8179f37f0da38312232b960d1a20b581dac7826f..d5864241e6b0d5952b73bab2f16a9334835253c1 100644 (file)
--- 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 1f05c38ef0b3d59c545b6daa97ad2b9f6e19844c..743eed1f904ce256d869e474558316013c5b6310 100644 (file)
--- 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 1d852ecbc311991a9574f20b4d3d867b6a38572f..a8bbda8d7b429c4f1b06e4f11697841a28c5c838 100644 (file)
--- 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 9e7ea760033e5308c64d625c8b63662822f225e9..1e6b427312ff2dafabaafa9b2876fe9cdc0a35d3 100644 (file)
--- 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 7a032f3147508d6bdf248d277593c8052e97f952..78b259e4440662e7d1f88c228117966655461728 100644 (file)
--- 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 78a1b914d4c58a296c8015bc3db9f39bc7ec4e51..bcdeed979298621c03b35bff074ddd78e2622584 100644 (file)
--- 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 67441304763335b4935151368859b2ef59efa00f..0c0d0f8d292bd6a613fb7b13bf0090d1b9f45a27 100644 (file)
--- 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 afef55be95b9fd5db52252fcb68e1c1d7e2960ff..5a58b6e7910acfacb4ea4c07b861527457afe5f1 100644 (file)
--- 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