summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLev Stipakov <lstipakov@gmail.com>2015-10-06 14:15:13 +0300
committerGert Doering <gert@greenie.muc.de>2015-10-06 13:17:34 +0200
commitb0fe94115fc4a75094d15452b7b89a0c0849087c (patch)
treeee8a44a798f86b42fd4e66388b3404c0fb6773aa
parent6ef5df14917500f107fd843a6dba61355edaeea0 (diff)
downloadopenvpn-b0fe94115fc4a75094d15452b7b89a0c0849087c.zip
openvpn-b0fe94115fc4a75094d15452b7b89a0c0849087c.tar.gz
openvpn-b0fe94115fc4a75094d15452b7b89a0c0849087c.tar.xz
Continuation of MSVS fixes
* Upgrade API level to Vista to implement get_default_gateway_ipv6 * Define HAVE_INET_NTOP/PTON since Vista has its own implementation of those Signed-off-by: Lev Stipakov <lstipakov@gmail.com> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <1444130113-23387-1-git-send-email-lstipakov@gmail.com> URL: http://article.gmane.org/gmane.network.openvpn.devel/10194 Signed-off-by: Gert Doering <gert@greenie.muc.de>
-rw-r--r--config-msvc.h5
-rw-r--r--msvc-env.bat2
2 files changed, 6 insertions, 1 deletions
diff --git a/config-msvc.h b/config-msvc.h
index ffd35f4..aa0eeff 100644
--- a/config-msvc.h
+++ b/config-msvc.h
@@ -128,3 +128,8 @@ typedef __int8 int8_t;
#include <config-msvc-local.h>
#endif
+// Vista and above has implementation of inet_ntop / inet_pton
+#if _WIN32_WINNT >= _WIN32_WINNT_VISTA
+ #define HAVE_INET_NTOP
+ #define HAVE_INET_PTON
+#endif
diff --git a/msvc-env.bat b/msvc-env.bat
index 2dd0f00..aabed75 100644
--- a/msvc-env.bat
+++ b/msvc-env.bat
@@ -12,7 +12,7 @@ if "%VCHOME%"=="" SET VCHOME=%VSHOME%\VC
set SOURCEBASE=%cd%
set SOLUTION=openvpn.sln
set CPPFLAGS=%CPPFLAGS%;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS
-set CPPFLAGS=%CPPFLAGS%;NTDDI_VERSION=NTDDI_WINXP;_WIN32_WINNT=_WIN32_WINNT_WINXP
+set CPPFLAGS=%CPPFLAGS%;NTDDI_VERSION=NTDDI_VISTA;_WIN32_WINNT=_WIN32_WINNT_VISTA
set CPPFLAGS=%CPPFLAGS%;_USE_32BIT_TIME_T
set CPPFLAGS=%CPPFLAGS%;%EXTRA_CPPFLAGS%