luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

#include <glib/gpoll.h>

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
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> 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 of the public API. (Part of Bug 505361 - gunixinputstream.c assumes
poll() available.) poll() available.)

1
glib/glib.h
View File

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

10
glib/gpoll.c
View File

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

4
glib/gpoll.h
View File

@ -17,15 +17,13 @@
* 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 (GLIB_COMPILATION)
#error "Only <glib.h> can be included directly." #error "Only <glib.h> can be included directly."
#endif #endif
#ifndef __G_POLL_H__ #ifndef __G_POLL_H__
#define __G_POLL_H__ #define __G_POLL_H__
#include <glib/gtypes.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* Any definitions using GPollFD or GPollFunc are primarily /* Any definitions using GPollFD or GPollFunc are primarily