Bug 556186 – gpoll.h breaks gmain.h inclusion

2008-10-19  Michael Natterer  <mitch@imendio.com>

	Bug 556186 – gpoll.h breaks gmain.h inclusion

	* glib/gpoll.h: different fix: disallow direct inclusion
	unconditionally again but make an exception if included from
	gmain.h to maintain compatibility.

svn path=/trunk/; revision=7615

diff --git a/ChangeLog b/ChangeLog
index 4b0d8d8269255a40c19cc36102562fbb1ab31c3d..bcd9fcf337dc376f49642b8414ef06f297e5dc22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-19  Michael Natterer  <mitch@imendio.com>
+
+       Bug 556186 – gpoll.h breaks gmain.h inclusion
+
+       * glib/gpoll.h: different fix: disallow direct inclusion
+       unconditionally again but make an exception if included from
+       gmain.h to maintain compatibility.
+
 2008-10-16  Matthias Clasen <mclasen@redhat.com>
 
        * configure.in: Bump version to 2.19.1

diff --git a/glib/gpoll.h b/glib/gpoll.h
index aa62ac1ef2009101f70d9cd353775badc22fef76..60b18578c63a4739b843dca3e056947759b715bf 100644 (file)
--- a/glib/gpoll.h
+++ b/glib/gpoll.h
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (__G_MAIN_H__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif