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/output/httpd_client.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 '')
| -rw-r--r-- | src/output/httpd_client.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/output/httpd_client.c b/src/output/httpd_client.c index e2c49c6c8..7a50f6fe6 100644 --- a/src/output/httpd_client.c +++ b/src/output/httpd_client.c @@ -24,6 +24,7 @@ #include "page.h" #include "icy_server.h" #include "glib_compat.h" +#include "glib_socket.h" #include <stdbool.h> #include <assert.h> @@ -459,11 +460,7 @@ httpd_client_new(struct httpd_output *httpd, int fd, bool metadata_supported) client->httpd = httpd; -#ifndef G_OS_WIN32 - client->channel = g_io_channel_unix_new(fd); -#else - client->channel = g_io_channel_win32_new_socket(fd); -#endif + client->channel = g_io_channel_new_socket(fd); /* GLib is responsible for closing the file descriptor */ g_io_channel_set_close_on_unref(client->channel, true); |