Thu Feb 26 09:31:51 CST 2009 Michael Jerris <mike@jerris.com>

  * su_localinfo.c: fix build on non-ipv6 hosts

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12304 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 32640f7d688f4f2c343d8f8baf09a6f18dab8f9b..6aa82cfd7c4e54f07c0c0e1552d7995dad5cf94a 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Thu Feb 26 12:36:01 CST 2009
+Thu Feb 26 12:38:20 CST 2009

diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c b/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c
index 0efc1a4679658839616ae5b7fb3f725cf567d848..de7279e4932950c67fe1debc543c8514b54f39d5 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c
@@ -96,8 +96,7 @@ static int localinfo6(su_localinfo_t const *, su_localinfo_t **);
 #endif
 
 static int li_scope4(uint32_t ip4);
-
-#ifdef SU_HAVE_IN6
+#if SU_HAVE_IN6
 static int li_scope6(struct in6_addr const *ip6);
 #endif
 
@@ -632,6 +631,9 @@ int localinfo4(su_localinfo_t const *hints, su_localinfo_t **rresult)
     struct ifreq ifreq[1];
     int scope, if_index, flags = 0, gni_flags = 0;
     char *if_name;
+#if SU_HAVE_IN6
+    su_sockaddr_t su2[1];
+#endif
 
 #if SA_LEN
     if (ifr->ifr_addr.sa_len > sizeof(ifr->ifr_addr))
@@ -749,7 +751,6 @@ int localinfo4(su_localinfo_t const *hints, su_localinfo_t **rresult)
 
 #if SU_HAVE_IN6
     if (su_xtra) {
-      su_sockaddr_t su2[1];
       /* Map IPv4 address to IPv6 address */
       memset(su2, 0, sizeof(*su2));
       su2->su_family = AF_INET6;