aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-10-13 09:08:37 +0200
committerMax Kellermann <max@duempel.org>2011-10-13 09:08:37 +0200
commit04525c025924fd133fce9115057b422ecd2b5ca0 (patch)
tree5fbfa8294b74841c3c84fc0a827b31068ae8f9c4
parentfa5e06f95dd7a96b3d188fd4bbcf085a98235bb5 (diff)
downloadmpd-04525c025924fd133fce9115057b422ecd2b5ca0.tar.gz
mpd-04525c025924fd133fce9115057b422ecd2b5ca0.tar.xz
mpd-04525c025924fd133fce9115057b422ecd2b5ca0.zip
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.
Diffstat (limited to '')
-rw-r--r--NEWS1
-rw-r--r--src/event_pipe.c7
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 <stdbool.h>
#include <assert.h>
@@ -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);