r2921 - in trunk/libmnetutil: . source

[mikma at minisip.org]

Author: mikma
Date: 2006-11-17 20:52:09 +0100 (Fri, 17 Nov 2006)
New Revision: 2921

Modified:
   trunk/libmnetutil/configure.ac
   trunk/libmnetutil/source/IP6Address.cxx
Log:
Fix IPV6 compilation on WinXP

Modified: trunk/libmnetutil/configure.ac
===================================================================
--- trunk/libmnetutil/configure.ac	2006-11-17 19:22:05 UTC (rev 2920)
+++ trunk/libmnetutil/configure.ac	2006-11-17 19:52:09 UTC (rev 2921)
@@ -24,7 +24,6 @@
 dnl networking headers
 AC_CHECK_HEADERS([netinet/in.h ws2tcpip.h])
 AC_CHECK_HEADERS([ifaddrs.h netdb.h sys/socket.h])
-AC_CHECK_FUNCS([getifaddrs getnameinfo])
 AM_MINISIP_CHECK_IPV6
 
 AC_ARG_ENABLE(srp,
@@ -38,13 +37,30 @@
       ])
 AM_CONDITIONAL(ENABLE_SRP, test "${ENABLE_SRP}" = "yes" )
 
+if test "$os_win" = "yes"; then
 dnl
 dnl mingw support
 dnl
+AC_CHECK_HEADERS([iphlpapi.h],,,[
+#include<windows.h>
+])
+
 AC_CHECK_LIB([wsock32], [main])
 AC_CHECK_LIB([iphlpapi], [main])
 AC_CHECK_LIB([dnsapi], [main])
+AC_CHECK_LIB([ws2_32], [main])
 
+dnl Check if some WinXP function declarations are present in the header files
+AM_MINISIP_CHECK_WINFUNCS(["getaddrinfo(0,0,0,0)" "freeaddrinfo(0)" "GetAdaptersAddresses(0,0,0,0,0)" "getnameinfo(0,0,0,0,0,0,0)"],,,[dnl
+#define _WIN32_WINNT 0x0501
+#include<windows.h>
+#include<iphlpapi.h>
+#include<ws2tcpip.h>
+])
+else
+AC_CHECK_FUNCS([getifaddrs getnameinfo])
+fi
+
 AM_MINISIP_CHECK_LIBMUTIL([0.3.1])
 AM_MINISIP_CHECK_LIBMCRYPTO([0.3.1])
 AM_MINISIP_CHECK_COMPLETE

Modified: trunk/libmnetutil/source/IP6Address.cxx
===================================================================
--- trunk/libmnetutil/source/IP6Address.cxx	2006-11-17 19:22:05 UTC (rev 2920)
+++ trunk/libmnetutil/source/IP6Address.cxx	2006-11-17 19:52:09 UTC (rev 2921)
@@ -23,6 +23,12 @@
 
 #include<config.h>
 
+#ifdef WIN32
+# ifdef HAVE_GETNAMEINFO
+#  define _WIN32_WINNT 0x0501 //XP or later
+# endif
+#endif
+
 #include<libmnetutil/IP6Address.h>
 
 #ifdef WIN32