#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

diff --git a/ChangeLog b/ChangeLog
index 1db4f8e..bc0b2f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.)
 

diff --git a/glib/glib.h b/glib/glib.h
index ab283a0..000d417 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -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>

diff --git a/glib/gpoll.c b/glib/gpoll.c
index d26cf2f..0fc2d9e 100644 (file)
--- a/glib/gpoll.c
+++ b/glib/gpoll.c
@@ -25,10 +25,10 @@
  * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GLib Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-/* 
+/*
  * MT safe
  */
 
@@ -65,7 +65,7 @@
 #if defined(_POLL_EMUL_H_) || defined(BROKEN_POLL)
 #undef HAVE_POLL
 #endif
-   
+
 #endif /* GLIB_HAVE_SYS_POLL_H */
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -246,7 +246,7 @@ poll_rest (gboolean  poll_msgs,
        }
       return 1;
     }
-    
+
   return 0;
 }
 
@@ -371,7 +371,7 @@ typedef long fd_mask;
 #  endif /* !_IBMR2 */
 #endif /* !NO_FD_SET */
 
-gint 
+gint
 g_poll (GPollFD *fds,
        guint    nfds,
        gint     timeout)

diff --git a/glib/gpoll.h b/glib/gpoll.h
index dccd832..07aa782 100644 (file)
--- a/glib/gpoll.h
+++ b/glib/gpoll.h
@@ -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