svn path=/trunk/; revision=7599
+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++
* 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