oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

event_pipe: fix WIN32 regression

Browse Source 
The event pipe is not a socket, and the patch that introduced
g_io_channel_new_socket() to the event pipe library was wrong.
This commit is contained in:
Max Kellermann
2011-10-13 09:08:37 +02:00
parent fa5e06f95d
commit 04525c0259
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -1,4 +1,5 @@
ver 0.16.6 (2010/??/??) ver 0.16.6 (2010/??/??)
* event_pipe: fix WIN32 regression
ver 0.16.5 (2010/10/09) ver 0.16.5 (2010/10/09)

7
src/event_pipe.c
View File

@@ -21,7 +21,6 @@
#include "event_pipe.h" #include "event_pipe.h"
#include "fd_util.h" #include "fd_util.h"
#include "mpd_error.h" #include "mpd_error.h"
#include "glib_socket.h"
#include <stdbool.h> #include <stdbool.h>
#include <assert.h> #include <assert.h>
@@ -95,7 +94,11 @@ void event_pipe_init(void)
if (ret < 0) if (ret < 0)
MPD_ERROR("Couldn't open pipe: %s", strerror(errno)); 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_encoding(channel, NULL, NULL);
g_io_channel_set_buffered(channel, false); g_io_channel_set_buffered(channel, false);