glib r7615 - in trunk: . glib

[mitch svn gnome org]

Author: mitch
Date: Sun Oct 19 20:38:14 2008
New Revision: 7615
URL: http://svn.gnome.org/viewvc/glib?rev=7615&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/glib/gpoll.h

Modified: trunk/glib/gpoll.h
==============================================================================
--- trunk/glib/gpoll.h	(original)
+++ trunk/glib/gpoll.h	Sun Oct 19 20:38:14 2008
@@ -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