[glib/wip/gmaincontext: 9/12] gsocket: use check/prepare only on win32
- From: Ryan Lortie <desrt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/gmaincontext: 9/12] gsocket: use check/prepare only on win32
- Date: Sun, 16 Feb 2014 15:16:48 +0000 (UTC)
commit 7d35099efd661f46d17bdc651319029e49ef0891
Author: Ryan Lortie <desrt desrt ca>
Date: Thu Feb 13 17:07:07 2014 -0500
gsocket: use check/prepare only on win32
There is no longer any code left in the check/prepare functions on UNIX,
so put %NULL in the GSourceFuncs vtable.
gio/gsocket.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/gio/gsocket.c b/gio/gsocket.c
index 5a09aeb..baa6c8a 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -3213,31 +3213,31 @@ typedef struct {
GIOCondition condition;
} GSocketSource;
+#ifdef G_OS_WIN32
static gboolean
-socket_source_prepare (GSource *source,
- gint *timeout)
+socket_source_prepare_win32 (GSource *source,
+ gint *timeout)
{
GSocketSource *socket_source = (GSocketSource *)source;
*timeout = -1;
-#ifdef G_OS_WIN32
socket_source->pollfd.revents = update_condition (socket_source->socket);
if ((socket_source->condition & socket_source->pollfd.revents) != 0)
return TRUE;
-#endif
return FALSE;
}
static gboolean
-socket_source_check (GSource *source)
+socket_source_check_win32 (GSource *source)
{
int timeout;
- return socket_source_prepare (source, &timeout);
+ return socket_source_prepare_win32 (source, &timeout);
}
+#endif
static gboolean
socket_source_dispatch (GSource *source,
@@ -3319,8 +3319,12 @@ socket_source_closure_callback (GSocket *socket,
static GSourceFuncs socket_source_funcs =
{
- socket_source_prepare,
- socket_source_check,
+#ifdef G_OS_WIN32
+ socket_source_prepare_win32,
+ socket_source_check_win32,
+#else
+ NULL, NULL, /* check, prepare */
+#endif
socket_source_dispatch,
socket_source_finalize,
(GSourceFunc)socket_source_closure_callback,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]