diff options
| author | Max Kellermann <max@duempel.org> | 2011-11-28 11:56:01 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-11-28 11:56:01 +0100 |
| commit | 4f093d5b979c3547c8dd8045dde5d91e8cc93461 (patch) | |
| tree | 94b1c12cfce14c90f26852e948ba419a8a7ba7eb /src/event_pipe.c | |
| parent | 37420c342bf9582a0de32d46f78716e913119400 (diff) | |
| parent | e1b032cbad5db7698104a93c2235fb7da1f8b580 (diff) | |
Merge branch 'v0.16.x'
Conflicts:
Makefile.am
NEWS
configure.ac
src/encoder/flac_encoder.c
src/log.c
src/pcm_buffer.c
Diffstat (limited to 'src/event_pipe.c')
| -rw-r--r-- | src/event_pipe.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/event_pipe.c b/src/event_pipe.c index 890d89f2..85fd6d91 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); |