From 94f082cb8044acd1b0ddc21b81a6ff31d32a664d Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 19 Oct 2008 20:38:14 +0000 Subject: [PATCH] =?utf8?q?Bug=20556186=20=E2=80=93=20gpoll.h=20breaks=20gm?= =?utf8?q?ain.h=20inclusion?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-10-19 Michael Natterer 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 --- ChangeLog | 8 ++++++++ glib/gpoll.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4b0d8d82..bcd9fcf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-10-19 Michael Natterer + + 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 * configure.in: Bump version to 2.19.1 diff --git a/glib/gpoll.h b/glib/gpoll.h index aa62ac1e..60b18578 100644 --- 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 can be included directly." #endif -- 2.34.1