From 60671872efc0165d5785c5961ae073c3405559c5 Mon Sep 17 00:00:00 2001
From: Mathieu Rene <mrene@avgs.ca>
Date: Sat, 14 Feb 2009 23:18:53 +0000
Subject: [PATCH] Fix sofia build on non-ipv6 hosts

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12018 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 libs/sofia-sip/libsofia-sip-ua/soa/soa.c          | 4 ++--
 libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c | 2 +-
 libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c  | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libs/sofia-sip/libsofia-sip-ua/soa/soa.c b/libs/sofia-sip/libsofia-sip-ua/soa/soa.c
index 49be1faa7d..d75b079931 100644
--- a/libs/sofia-sip/libsofia-sip-ua/soa/soa.c
+++ b/libs/sofia-sip/libsofia-sip-ua/soa/soa.c
@@ -2526,9 +2526,9 @@ soa_init_sdp_connection_with_session(soa_session_t *ss,
 	  break;
 	else if (!li6)
 	  li6 = li;		/* Best IP6 address */
-      }
+      } else
 #endif
-      else if (li->li_family == AF_INET) {
+       if (li->li_family == AF_INET) {
 	if (ip4 >= ip6)
 	  break;
 	else if (!li4)
diff --git a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c
index f61fb916e8..d38fcc74d5 100644
--- a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c
+++ b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c
@@ -1526,7 +1526,6 @@ sres_sip_process_numeric(sres_sip_t *srs)
   char const *target = srs->srs_target;
   su_addrinfo_t ai[1];
   su_sockaddr_t su[1];
-  char buffer[64];
   int i;
 
   memset(ai, 0, (sizeof ai));
@@ -1551,6 +1550,7 @@ sres_sip_process_numeric(sres_sip_t *srs)
     }
   }
   else if (host_is_ip6_reference(target)) {
+    char buffer[64];
     size_t len = strlen(target) - 2;
 
     ai->ai_addr = memset(su, 0, (sizeof su->su_sin6));
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 f992af9b18..0efc1a4679 100644
--- a/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c
@@ -96,7 +96,10 @@ static int localinfo6(su_localinfo_t const *, su_localinfo_t **);
 #endif
 
 static int li_scope4(uint32_t ip4);
+
+#ifdef SU_HAVE_IN6
 static int li_scope6(struct in6_addr const *ip6);
+#endif
 
 #if !SU_LOCALINFO_TEST