From: Michael Natterer Date: Sun, 19 Oct 2008 20:38:14 +0000 (+0000) Subject: Bug 556186 – gpoll.h breaks gmain.h inclusion X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=94f082cb8044acd1b0ddc21b81a6ff31d32a664d;p=dana%2Fcg-glib.git Bug 556186 – gpoll.h breaks gmain.h inclusion 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 --- 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