From 04525c025924fd133fce9115057b422ecd2b5ca0 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 13 Oct 2011 09:08:37 +0200 Subject: [PATCH] event_pipe: fix WIN32 regression The event pipe is not a socket, and the patch that introduced g_io_channel_new_socket() to the event pipe library was wrong. --- NEWS | 1 + src/event_pipe.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 933cbd8d6..31bbc4ac1 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ ver 0.16.6 (2010/??/??) +* event_pipe: fix WIN32 regression ver 0.16.5 (2010/10/09) diff --git a/src/event_pipe.c b/src/event_pipe.c index edfd40eb5..5b519984f 100644 --- a/src/event_pipe.c +++ b/src/event_pipe.c @@ -21,7 +21,6 @@ #include "event_pipe.h" #include "fd_util.h" #include "mpd_error.h" -#include "glib_socket.h" #include #include @@ -95,7 +94,11 @@ void event_pipe_init(void) if (ret < 0) MPD_ERROR("Couldn't open pipe: %s", strerror(errno)); - channel = g_io_channel_new_socket(event_pipe[0]); +#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 g_io_channel_set_encoding(channel, NULL, NULL); g_io_channel_set_buffered(channel, false);