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/event_pipe.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/event_pipe.c') diff --git a/src/event_pipe.c b/src/event_pipe.c index 5b519984..edfd40eb 100644 --- a/src/event_pipe.c +++ b/src/event_pipe.c @@ -21,6 +21,7 @@ #include "event_pipe.h" #include "fd_util.h" #include "mpd_error.h" +#include "glib_socket.h" #include #include @@ -94,11 +95,7 @@ void event_pipe_init(void) if (ret < 0) MPD_ERROR("Couldn't open pipe: %s", strerror(errno)); -#ifndef G_OS_WIN32 - channel = g_io_channel_unix_new(event_pipe[0]); -#else - channel = g_io_channel_win32_new_fd(event_pipe[0]); -#endif + channel = g_io_channel_new_socket(event_pipe[0]); g_io_channel_set_encoding(channel, NULL, NULL); g_io_channel_set_buffered(channel, false); -- cgit v1.2.3