glib r7599 - in trunk: . glib

[chpe svn gnome org]

Author: chpe
Date: Tue Oct 14 10:11:29 2008
New Revision: 7599
URL: http://svn.gnome.org/viewvc/glib?rev=7599&view=rev

Log:
Bug 556186 â gpoll.h breaks gmain.h inclusion

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

Modified: trunk/glib/gpoll.h
==============================================================================
--- trunk/glib/gpoll.h	(original)
+++ trunk/glib/gpoll.h	Tue Oct 14 10:11:29 2008
@@ -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