aboutsummaryrefslogtreecommitdiffstats
path: root/src/client_new.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-19 20:40:33 +0200
committerMax Kellermann <max@duempel.org>2011-09-20 08:35:25 +0200
commitb03f9ece05c6f9a6410da48ec024f9d6bed0dc82 (patch)
tree93a4e566fd407330c039b958ab819d7a3916f6cc /src/client_new.c
parent1d8840412fc1dd76a73ee13413cd7fc9a6ff229a (diff)
downloadmpd-b03f9ece05c6f9a6410da48ec024f9d6bed0dc82.tar.gz
mpd-b03f9ece05c6f9a6410da48ec024f9d6bed0dc82.tar.xz
mpd-b03f9ece05c6f9a6410da48ec024f9d6bed0dc82.zip
glib_socket.h: wrap g_io_channel_*_new() calls portably
The server_socket library (used by the httpd output plugin) didn't check for WIN32, that's fixed now.
Diffstat (limited to '')
-rw-r--r--src/client_new.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/client_new.c b/src/client_new.c
index 781a36524..0ee21916b 100644
--- a/src/client_new.c
+++ b/src/client_new.c
@@ -22,6 +22,7 @@
#include "fifo_buffer.h"
#include "socket_util.h"
#include "permission.h"
+#include "glib_socket.h"
#include <assert.h>
#include <sys/types.h>
@@ -82,11 +83,7 @@ void client_new(int fd, const struct sockaddr *sa, size_t sa_length, int uid)
client = g_new0(struct client, 1);
-#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);
/* NULL encoding means the stream is binary safe; the MPD