[glib/glib-2-22] Fix UnixWare build by not using "sa_len" as a variable name
- From: Matthias Clasen <matthiasc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glib/glib-2-22] Fix UnixWare build by not using "sa_len" as a variable name
- Date: Thu, 7 Jan 2010 00:35:14 +0000 (UTC)
commit 1a0f372907414a148a652aedb39068bd9b83790b
Author: Dan Winship <danw gnome org>
Date: Fri Dec 18 10:26:09 2009 +0100
Fix UnixWare build by not using "sa_len" as a variable name
https://bugzilla.gnome.org/show_bug.cgi?id=604875
(cherry picked from commit 28d91b5bb6f0543c259976d8338a7b4d95054dd3)
gio/gnetworkingprivate.h | 2 +-
gio/gresolver.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gio/gnetworkingprivate.h b/gio/gnetworkingprivate.h
index 050b3a2..56b800b 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 2b30457..e7dd8ad 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);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]