gpoll.h   gpoll.h 
skipping to change at line 62 skipping to change at line 62
* *
* But note that G_WIN32_MSG_HANDLE GPollFDs should not be used by GDK * But note that G_WIN32_MSG_HANDLE GPollFDs should not be used by GDK
* (GTK) programs, as GDK itself wants to read messages and convert them * (GTK) programs, as GDK itself wants to read messages and convert them
* to GDK events. * to GDK events.
* *
* So, unless you really know what you are doing, it's best not to try * So, unless you really know what you are doing, it's best not to try
* to use the main loop polling stuff for your own needs on * to use the main loop polling stuff for your own needs on
* Windows. * Windows.
*/ */
typedef struct _GPollFD GPollFD; typedef struct _GPollFD GPollFD;
typedef gint (*GPollFunc) (GPollFD *ufds,
guint nfsd,
gint timeout_);
/**
* GPollFunc:
* @ufds: an array of #GPollFD elements
* @nfsd: the number of elements in @ufds
* @timeout_: the maximum time to wait for an event of the file descriptors
.
* A negative value indicates an infinite timeout.
*
* Specifies the type of function passed to g_main_context_set_poll_func().
* The semantics of the function should match those of the poll() system ca
ll.
*
* Returns: the number of #GPollFD elements which have events or errors
* reported, or -1 if an error occurred.
*/
typedef gint (*GPollFunc) (GPollFD *ufds,
guint nfsd,
gint timeout_);
/**
* GPollFD:
* @fd: the file descriptor to poll (or a <type>HANDLE</type> on Win32)
* @events: a bitwise combination from #GIOCondition, specifying which
* events should be polled for. Typically for reading from a file
* descriptor you would use %G_IO_IN | %G_IO_HUP | %G_IO_ERR, and
* for writing you would use %G_IO_OUT | %G_IO_ERR.
* @revents: a bitwise combination of flags from #GIOCondition, returned
* from the poll() function to indicate which events occurred.
*/
struct _GPollFD struct _GPollFD
{ {
#if defined (G_OS_WIN32) && GLIB_SIZEOF_VOID_P == 8 #if defined (G_OS_WIN32) && GLIB_SIZEOF_VOID_P == 8
gint64 fd; gint64 fd;
#else #else
gint fd; gint fd;
#endif #endif
gushort events; gushort events;
gushort revents; gushort revents;
}; };
 End of changes. 2 change blocks. 
3 lines changed or deleted 29 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/