From b03f9ece05c6f9a6410da48ec024f9d6bed0dc82 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 19 Sep 2011 20:40:33 +0200 Subject: glib_socket.h: wrap g_io_channel_*_new() calls portably The server_socket library (used by the httpd output plugin) didn't check for WIN32, that's fixed now. --- src/server_socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/server_socket.c') diff --git a/src/server_socket.c b/src/server_socket.c index bb7a6f097..c10740676 100644 --- a/src/server_socket.c +++ b/src/server_socket.c @@ -22,6 +22,7 @@ #include "socket_util.h" #include "fd_util.h" #include "glib_compat.h" +#include "glib_socket.h" #include #include @@ -218,7 +219,7 @@ server_socket_open(struct server_socket *ss, GError **error_r) /* register in the GLib main loop */ - GIOChannel *channel = g_io_channel_unix_new(s->fd); + GIOChannel *channel = g_io_channel_new_socket(s->fd); s->source_id = g_io_add_watch(channel, G_IO_IN, server_socket_in_event, s); g_io_channel_unref(channel); -- cgit v1.2.3 From c476819cb1186770b1b7395851e394caac39cbc8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 19 Sep 2011 21:04:19 +0200 Subject: fd_util: add function close_socket() Wrap close(), use closesocket() on WIN32/WinSock. --- src/server_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server_socket.c') diff --git a/src/server_socket.c b/src/server_socket.c index c10740676..b4114d2d9 100644 --- a/src/server_socket.c +++ b/src/server_socket.c @@ -253,7 +253,7 @@ server_socket_close(struct server_socket *ss) continue; g_source_remove(s->source_id); - close(s->fd); + close_socket(s->fd); s->fd = -1; } } -- cgit v1.2.3