summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2009-12-18 10:26:09 +0100
committerDan Winship <danw@gnome.org>2009-12-18 10:26:09 +0100
commit28d91b5bb6f0543c259976d8338a7b4d95054dd3 (patch)
tree9423491eb2e897b72208a55d4d913c1e8a8ae428
parent50741f2fb2db13ef236974e676d1b6472c3aef5c (diff)
Fix UnixWare build by not using "sa_len" as a variable name
https://bugzilla.gnome.org/show_bug.cgi?id=604875
-rw-r--r--gio/gnetworkingprivate.h2
-rw-r--r--gio/gresolver.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/gio/gnetworkingprivate.h b/gio/gnetworkingprivate.h
index 050b3a297..56b800b9d 100644
--- a/gio/gnetworkingprivate.h
+++ b/gio/gnetworkingprivate.h
@@ -73,7 +73,7 @@ GList *_g_resolver_addresses_from_addrinfo (const char *hostname,
void _g_resolver_address_to_sockaddr (GInetAddress *address,
struct sockaddr_storage *sa,
- gsize *sa_len);
+ gsize *len);
char *_g_resolver_name_from_nameinfo (GInetAddress *address,
const gchar *name,
gint gni_retval,
diff --git a/gio/gresolver.c b/gio/gresolver.c
index 2b3045721..e7dd8ade6 100644
--- a/gio/gresolver.c
+++ b/gio/gresolver.c
@@ -759,13 +759,13 @@ _g_resolver_addresses_from_addrinfo (const char *hostname,
void
_g_resolver_address_to_sockaddr (GInetAddress *address,
struct sockaddr_storage *sa,
- gsize *sa_len)
+ gsize *len)
{
GSocketAddress *sockaddr;
sockaddr = g_inet_socket_address_new (address, 0);
g_socket_address_to_native (sockaddr, (struct sockaddr *)sa, sizeof (*sa), NULL);
- *sa_len = g_socket_address_get_native_size (sockaddr);
+ *len = g_socket_address_get_native_size (sockaddr);
g_object_unref (sockaddr);
}