summaryrefslogtreecommitdiff
path: root/ics-openvpn-stripped/main/openssl/e_os.h
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-12-12 11:49:24 +0100
committerParménides GV <parmegv@sdf.org>2014-12-12 11:49:24 +0100
commit0e7e4005460964cf8dac080e3d99e1df2a1bdc4d (patch)
tree63fdba4f03bf47b0faa62b9d24cdff9a5a79a8b7 /ics-openvpn-stripped/main/openssl/e_os.h
parent61dc26ab57ad4e2dba341998cabec3f411865e46 (diff)
Updated ics-openvpn to rev924.
Diffstat (limited to 'ics-openvpn-stripped/main/openssl/e_os.h')
-rw-r--r--ics-openvpn-stripped/main/openssl/e_os.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/ics-openvpn-stripped/main/openssl/e_os.h b/ics-openvpn-stripped/main/openssl/e_os.h
index 6a0aad1d..733155e4 100644
--- a/ics-openvpn-stripped/main/openssl/e_os.h
+++ b/ics-openvpn-stripped/main/openssl/e_os.h
@@ -373,7 +373,16 @@ static unsigned int _strlen31(const char *str)
# define check_winnt() (1)
#else
# define check_winnt() (GetVersion() < 0x80000000)
-#endif
+#endif
+
+/*
+ * Visual Studio: inline is available in C++ only, however
+ * __inline is available for C, see
+ * http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx
+ */
+#if defined(_MSC_VER) && !defined(__cplusplus) && !defined(inline)
+# define inline __inline
+#endif
#else /* The non-microsoft world */
@@ -738,4 +747,3 @@ struct servent *getservbyname(const char *name, const char *proto);
#endif
#endif
-