Bug 556186 – gpoll.h breaks gmain.h inclusion

svn path=/trunk/; revision=7599
This commit is contained in:
Christian Persch 2008-10-14 10:11:29 +00:00
parent 62510425df
commit 0879e4aabb
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,10 @@
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++

View File

@ -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