Using SU_HAVE_IN6 on win32, too.

darcs-hash:20051101140218-65a35-dbc5ec24f3706d3070d32f13361fe9710afadb16.gz

libsofia-sip-ua/su/su.c

@@ -504,7 +504,7 @@ int su_match_sockaddr(su_sockaddr_t const *a, su_sockaddr_t const *b)
 /** Convert mapped/compat address to IPv4 address */
 void su_canonize_sockaddr(su_sockaddr_t *su)
 {
-#if HAVE_SIN6
+#if SU_HAVE_IN6
   if (su->su_family != AF_INET6)
     return;
 

libsofia-sip-ua/su/su.h

@@ -83,13 +83,13 @@ uint32_t su_ntohl(uint32_t l)
 #define ntohl su_ntohl
 #define htonl su_ntohl
 
-#  ifndef IPPROTO_IPV6
-#    if SU_HAVE_NT /* ipv6 header files changed from NT to W2K */
-#      include <ws2ip6.h>
-#    else
-#      include <tpipv6.h>  // For IPv6 Tech Preview.
-#    endif
+#  if SU_HAVE_IN6 && !defined(IPPROTO_IPV6)
+#    include <tpipv6.h>
+#  else
+   /* We need socklen_t, getaddrinfo() and friends */
+#error Insufficient winsock environment: socklen_t, getaddrinfo() missing
 #  endif
+
 #endif
 
 /* ---------------------------------------------------------------------- */

libsofia-sip-ua/su/su_torture.c

@@ -141,7 +141,7 @@ int test_sockaddr(void)
   TEST_1(su_match_sockaddr(a, b));
   a->su_sin.sin_addr.s_addr = 0;
   TEST_1(su_match_sockaddr(a, b));
-#if HAVE_SIN6
+#if SU_HAVE_IN6
   a->su_family = AF_INET6;
   TEST_1(!su_match_sockaddr(a, b));
   b->su_family = AF_INET6;

win32/config.h

@@ -25,7 +25,7 @@
 /**@file win32/config.h
  * @brief <config.h> used by Windows.
  *
- * Copy this as config.h if you are running WIN32 (or run autoconf-all.cmd). 
+ * Use this on WIN32. 
  *
  * @author Pekka Pessi <Pekka.Pessi@nokia.com>
  *
@@ -189,8 +189,7 @@
 #undef HAVE_SIGPIPE
 
 /* Define this as 1 if you have IPv6 structures and constants */
-/* PPe: not yet */
-#undef HAVE_SIN6
+#define HAVE_SIN6 1
 
 /* Define this as 1 if you have WIN32 WSAIoctl SIO_ADDRESS_LIST_QUERY. */
 #define HAVE_SIO_ADDRESS_LIST_QUERY 1
@@ -376,6 +375,7 @@
 #define HAVE_INTERFACE_INFO 	   (1) 
 
 #ifdef LIBSOFIA_SIP_UA_EXPORTS
+/* We are compiling a DLL */
 #define BNF_DLL  __declspec(dllexport)
 #define HTTP_DLL __declspec(dllexport)
 #define IPT_DLL  __declspec(dllexport)

win32/su_configure_win32.h

@@ -46,7 +46,7 @@
 #define SU_HAVE_BSDSOCK         0
 #define SU_HAVE_STDINT          (0)
 #define SU_HAVE_NT              0
-#define SU_HAVE_IN6             (0)
+#define SU_HAVE_IN6             1
 
 #define SU_HAVE_PTHREADS        (1)
 
@@ -95,4 +95,3 @@
 #define EPROTO          (20006)
 
 #define ssize_t SSIZE_T
-