luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-26 12:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 556186 – gpoll.h breaks gmain.h inclusion

Browse Source 
2008-10-19  Michael Natterer  <mitch@imendio.com>

	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
This commit is contained in:
Michael Natterer 2008-10-19 20:38:14 +00:00 committed by Michael Natterer
parent 8959a9dfe7
commit 94f082cb80
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-10-19 Michael Natterer <mitch@imendio.com>
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 <mclasen@redhat.com> 2008-10-16 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version to 2.19.1 * configure.in: Bump version to 2.19.1

2
glib/gpoll.h
View File

@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA. * 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 <glib.h> can be included directly." #error "Only <glib.h> can be included directly."
#endif #endif