luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-02 03:46:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

gio/tests/socket-client, socket-server: fix for win32

Browse Source 
The addition of unix socket support broke these on win32
This commit is contained in:
Dan Winship
2010-04-23 12:21:38 -04:00
parent 3baff96b37
commit 5b329c506a
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/tests/socket-client.c
View File

@@ -27,8 +27,10 @@ static GOptionEntry cmd_entries[] = {
"Enable non-blocking i/o", NULL}, "Enable non-blocking i/o", NULL},
{"use-source", 's', 0, G_OPTION_ARG_NONE, &use_source, {"use-source", 's', 0, G_OPTION_ARG_NONE, &use_source,
"Use GSource to wait for non-blocking i/o", NULL}, "Use GSource to wait for non-blocking i/o", NULL},
#ifdef G_OS_UNIX
{"unix", 'U', 0, G_OPTION_ARG_NONE, &unix_socket, {"unix", 'U', 0, G_OPTION_ARG_NONE, &unix_socket,
"Use a unix socket instead of IP", NULL}, "Use a unix socket instead of IP", NULL},
#endif
{NULL} {NULL}
}; };

6
gio/tests/socket-common.c
View File

@@ -11,7 +11,7 @@ static const char *unix_socket_address_types[] = {
static char * static char *
socket_address_to_string (GSocketAddress *address) socket_address_to_string (GSocketAddress *address)
{ {
char *res; char *res = NULL;
if (G_IS_INET_SOCKET_ADDRESS (address)) if (G_IS_INET_SOCKET_ADDRESS (address))
{ {
@@ -25,6 +25,7 @@ socket_address_to_string (GSocketAddress *address)
res = g_strdup_printf ("%s:%d", str, port); res = g_strdup_printf ("%s:%d", str, port);
g_free (str); g_free (str);
} }
#ifdef G_OS_UNIX
else if (G_IS_UNIX_SOCKET_ADDRESS (address)) else if (G_IS_UNIX_SOCKET_ADDRESS (address))
{ {
GUnixSocketAddress *uaddr = G_UNIX_SOCKET_ADDRESS (address); GUnixSocketAddress *uaddr = G_UNIX_SOCKET_ADDRESS (address);
@@ -33,6 +34,7 @@ socket_address_to_string (GSocketAddress *address)
unix_socket_address_types[g_unix_socket_address_get_address_type (uaddr)], unix_socket_address_types[g_unix_socket_address_get_address_type (uaddr)],
g_unix_socket_address_get_path (uaddr)); g_unix_socket_address_get_path (uaddr));
} }
#endif
return res; return res;
} }
@@ -40,6 +42,7 @@ socket_address_to_string (GSocketAddress *address)
GSocketAddress * GSocketAddress *
socket_address_from_string (const char *name) socket_address_from_string (const char *name)
{ {
#ifdef G_OS_UNIX
int i, len; int i, len;
for (i = 0; i < G_N_ELEMENTS (unix_socket_address_types); i++) for (i = 0; i < G_N_ELEMENTS (unix_socket_address_types); i++)
@@ -52,5 +55,6 @@ socket_address_from_string (const char *name)
(GUnixSocketAddressType)i); (GUnixSocketAddressType)i);
} }
} }
#endif
return NULL; return NULL;
} }

2
gio/tests/socket-server.c
View File

@@ -32,8 +32,10 @@ static GOptionEntry cmd_entries[] = {
"Enable non-blocking i/o", NULL}, "Enable non-blocking i/o", NULL},
{"use-source", 's', 0, G_OPTION_ARG_NONE, &use_source, {"use-source", 's', 0, G_OPTION_ARG_NONE, &use_source,
"Use GSource to wait for non-blocking i/o", NULL}, "Use GSource to wait for non-blocking i/o", NULL},
#ifdef G_OS_UNIX
{"unix", 'U', 0, G_OPTION_ARG_NONE, &unix_socket, {"unix", 'U', 0, G_OPTION_ARG_NONE, &unix_socket,
"Use a unix socket instead of IP", NULL}, "Use a unix socket instead of IP", NULL},
#endif
{NULL} {NULL}
}; };