From: Christian Persch <chpe@src.gnome.org>
Date: Tue, 14 Oct 2008 10:11:29 +0000 (+0000)
Subject: Bug 556186 – gpoll.h breaks gmain.h inclusion
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=0879e4aabb02d1a18dff64b033e04e187b7cc044;p=dana%2Fcg-glib.git

Bug 556186 – gpoll.h breaks gmain.h inclusion

svn path=/trunk/; revision=7599
---

diff --git a/ChangeLog b/ChangeLog
index b7b57fa9..88910724 100644
--- 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 07aa782d..aa62ac1e 100644
--- 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