Fix UnixWare build by not using "sa_len" as a variable name

https://bugzilla.gnome.org/show_bug.cgi?id=604875

diff --git a/gio/gnetworkingprivate.h b/gio/gnetworkingprivate.h
index 050b3a2..56b800b 100644 (file)
--- 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 2b30457..e7dd8ad 100644 (file)
--- 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);
 }