#
#	gio/gnetworkingprivate.h gio/gresolver.c
#	s/sa_len/g_sa_len/ because sysv5 defines sa_len sa_un.sa_s.sa_saus_len
#
--- glib-2.23.0/gio/gnetworkingprivate.h.old	2009-08-28 19:52:22.000000000 -0700
+++ glib-2.23.0/gio/gnetworkingprivate.h	2009-12-17 09:27:30.501448000 -0800
@@ -73,7 +73,7 @@
 
 void   _g_resolver_address_to_sockaddr     (GInetAddress            *address,
 					    struct sockaddr_storage *sa,
-					    gsize                   *sa_len);
+					    gsize                   *g_sa_len);
 char  *_g_resolver_name_from_nameinfo      (GInetAddress     *address,
 					    const gchar      *name,
 					    gint              gni_retval,
--- glib-2.23.0/gio/gresolver.c.old	2009-08-28 19:52:22.000000000 -0700
+++ glib-2.23.0/gio/gresolver.c	2009-12-17 09:27:40.491448004 -0800
@@ -759,13 +759,13 @@
 void
 _g_resolver_address_to_sockaddr (GInetAddress            *address,
                                  struct sockaddr_storage *sa,
-                                 gsize                   *sa_len)
+                                 gsize                   *g_sa_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);
+  *g_sa_len = g_socket_address_get_native_size (sockaddr);
   g_object_unref (sockaddr);
 }
 
