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.
This commit is contained in:
Max Kellermann
2011-09-19 20:40:33 +02:00
parent 1d8840412f
commit b03f9ece05
6 changed files with 49 additions and 16 deletions

View File

@@ -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);