diff options
author | Max Kellermann <max@duempel.org> | 2011-09-20 08:47:06 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2011-09-20 08:47:06 +0200 |
commit | 921553d7bb38345ba99c069fa1ee7816d5130c9b (patch) | |
tree | 879a0384b9a4bc93e9b3c3c476812c660b7e63b4 /src/event_pipe.c | |
parent | 27946a981ff4192f064feb3117567463c137933f (diff) | |
parent | c476819cb1186770b1b7395851e394caac39cbc8 (diff) | |
download | mpd-921553d7bb38345ba99c069fa1ee7816d5130c9b.tar.gz mpd-921553d7bb38345ba99c069fa1ee7816d5130c9b.tar.xz mpd-921553d7bb38345ba99c069fa1ee7816d5130c9b.zip |
Merge branch 'v0.16.x'
Diffstat (limited to 'src/event_pipe.c')
-rw-r--r-- | src/event_pipe.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/event_pipe.c b/src/event_pipe.c index 85fd6d917..890d89f24 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 <stdbool.h> #include <assert.h> @@ -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); |