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.

event_pipe: fix WIN32 regression
04525c02 · Max Kellermann · fa5e06f9 · 04525c02 · 04525c02
Commit 04525c02 authored Oct 13, 2011 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

NEWS NEWS +1 -0

event_pipe.c src/event_pipe.c +5 -2

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.16.6 (2010/??/??)
+* event_pipe: fix WIN32 regression


 ver 0.16.5 (2010/10/09)

--- 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);