Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
04525c02
Commit
04525c02
authored
Oct 13, 2011
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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.
parent
fa5e06f9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
NEWS
NEWS
+1
-0
event_pipe.c
src/event_pipe.c
+5
-2
No files found.
NEWS
View file @
04525c02
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)
...
...
src/event_pipe.c
View file @
04525c02
...
@@ -21,7 +21,6 @@
...
@@ -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)
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment