glib r7537 - in trunk: . glib

[mitch svn gnome org]

Author: mitch
Date: Tue Sep 23 18:56:31 2008
New Revision: 7537
URL: http://svn.gnome.org/viewvc/glib?rev=7537&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/glib/glib.h
   trunk/glib/gpoll.c
   trunk/glib/gpoll.h

Modified: trunk/glib/glib.h
==============================================================================
--- trunk/glib/glib.h	(original)
+++ trunk/glib/glib.h	Tue Sep 23 18:56:31 2008
@@ -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>

Modified: trunk/glib/gpoll.c
==============================================================================
--- trunk/glib/gpoll.c	(original)
+++ trunk/glib/gpoll.c	Tue Sep 23 18:56:31 2008
@@ -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 @@
 	}
       return 1;
     }
-    
+
   return 0;
 }
 
@@ -371,7 +371,7 @@
 #  endif /* !_IBMR2 */
 #endif /* !NO_FD_SET */
 
-gint 
+gint
 g_poll (GPollFD *fds,
 	guint    nfds,
 	gint     timeout)

Modified: trunk/glib/gpoll.h
==============================================================================
--- trunk/glib/gpoll.h	(original)
+++ trunk/glib/gpoll.h	Tue Sep 23 18:56:31 2008
@@ -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