diff options
| author | Christian Persch <chpe@src.gnome.org> | 2008-10-14 10:11:29 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2008-10-14 10:11:29 +0000 |
| commit | 0879e4aabb02d1a18dff64b033e04e187b7cc044 (patch) | |
| tree | 7b8f49a59998b224f56008f7b26d822064379038 | |
| parent | 62510425df90bddd2c688fd284347775de3b4702 (diff) | |
Bug 556186 – gpoll.h breaks gmain.h inclusion
svn path=/trunk/; revision=7599
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | glib/gpoll.h | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -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++ 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 <glib.h> can be included directly." #endif |