summaryrefslogtreecommitdiff
path: root/app/openvpn/config-msvc.h
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-06-11 11:56:59 +0200
committerParménides GV <parmegv@sdf.org>2014-06-11 19:50:54 +0200
commit3e121542d8b7ab5201c47bbd3ba5611a23c54759 (patch)
treea6035639e7baa88dd122d0d4e85791726606389a /app/openvpn/config-msvc.h
parentac69881af1b7bfcdd185989f3e434556b1d62fed (diff)
Correctly connects to millipede.
Location keyword on android.cfg isn't supported, EIP corresponding code has been commented out. I think we should support it in ics-openvpn, so that we can show the location instead of the server name. I've updated all opensssl, openvpn, etc. subprojects from rev 813 of ics-openvpn, and jni too.
Diffstat (limited to 'app/openvpn/config-msvc.h')
-rw-r--r--app/openvpn/config-msvc.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/openvpn/config-msvc.h b/app/openvpn/config-msvc.h
index 99c00f9f..fa993843 100644
--- a/app/openvpn/config-msvc.h
+++ b/app/openvpn/config-msvc.h
@@ -76,6 +76,9 @@
#define HAVE_OPENSSL_ENGINE 1
+#define PATH_SEPARATOR '\\'
+#define PATH_SEPARATOR_STR "\\"
+
#ifndef __cplusplus
#define inline __inline
#endif
@@ -89,7 +92,10 @@
#define strncasecmp strnicmp
#define strcasecmp _stricmp
#define snprintf _snprintf
+
+#if _MSC_VER < 1800
#define strtoull strtoul
+#endif
#define in_addr_t uint32_t
#define ssize_t SSIZE_T