From 0879e4aabb02d1a18dff64b033e04e187b7cc044 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 14 Oct 2008 10:11:29 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20556186=20=E2=80=93=20gpoll.h=20breaks=20g?= =?UTF-8?q?main.h=20inclusion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=7599 --- ChangeLog | 7 +++++++ glib/gpoll.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b7b57fa93..88910724f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-14 Christian Persch + + 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 Bug 556101 – static mutex yields warnings with g++ diff --git a/glib/gpoll.h b/glib/gpoll.h index 07aa782d3..aa62ac1ef 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 can be included directly." #endif