Bug 556186 – gpoll.h breaks gmain.h inclusion

svn path=/trunk/; revision=7599

diff --git a/ChangeLog b/ChangeLog
index b7b57fa93d65e7a1051de05e067b33b63c49fd31..88910724fe10b6404eeffe0088178ff584701382 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-14  Christian Persch <chpe@gnome.org>
+
+       Bug 556186 – gpoll.h breaks gmain.h inclusion
+
+       * glib/gpoll.h: Only disallow direct inclusion when
+       G_DISABLE_SINGLE_INCLUDES is defined.
+
 2008-10-13  Sven Herzberg  <sven@imendio.com>
 
        Bug 556101 – static mutex yields warnings with g++

diff --git a/glib/gpoll.h b/glib/gpoll.h
index 07aa782d3d89f484a0b83c7f6f99cc09957708ac..aa62ac1ef2009101f70d9cd353775badc22fef76 100644 (file)
--- a/glib/gpoll.h
+++ b/glib/gpoll.h
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if !defined (__GLIB_H_INSIDE__) && !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