#include <glib/gpoll.h>

2008-09-23  Michael Natterer  <mitch@imendio.com>

	* glib/glib.h: #include <glib/gpoll.h>

	* glib/gpoll.h: #error out if gpoll.h is included directly.

	* glib/gpoll.c: remove trailing whitespace.


svn path=/trunk/; revision=7537
This commit is contained in:
Michael Natterer 2008-09-23 18:56:31 +00:00 committed by Michael Natterer
parent 333ef486a4
commit db1ff156d5
4 changed files with 16 additions and 9 deletions

View File

@ -1,6 +1,14 @@
2008-09-23 Michael Natterer <mitch@imendio.com>
* glib/glib.h: #include <glib/gpoll.h>
* glib/gpoll.h: #error out if gpoll.h is included directly.
* glib/gpoll.c: remove trailing whitespace.
2008-09-23 Dan Winship <danw@gnome.org>
* glib/gpoll.c (g_poll): Move this out of gmain.c and make it part
* glib/gpoll.[ch] (g_poll): Move this out of gmain.c and make it part
of the public API. (Part of Bug 505361 - gunixinputstream.c assumes
poll() available.)

View File

@ -59,6 +59,7 @@
#include <glib/gnode.h>
#include <glib/goption.h>
#include <glib/gpattern.h>
#include <glib/gpoll.h>
#include <glib/gprimes.h>
#include <glib/gqsort.h>
#include <glib/gquark.h>

View File

@ -17,15 +17,13 @@
* Boston, MA 02111-1307, USA.
*/
#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
#error "Only <glib.h> can be included directly."
#endif
#ifndef __G_POLL_H__
#define __G_POLL_H__
#include <glib/gtypes.h>
G_BEGIN_DECLS
/* Any definitions using GPollFD or GPollFunc are primarily