summaryrefslogtreecommitdiffstats
path: root/e_os.h
diff options
context:
space:
mode:
authorEmilia Kasper <emilia@openssl.org>2014-08-19 13:18:07 +0200
committerEmilia Kasper <emilia@openssl.org>2014-08-21 15:56:58 +0200
commitf511b25a7370c775dc9fd6198dbacd1706cf242b (patch)
tree0f3315c2f6a9b44197a359e1002106624b43546e /e_os.h
parentda92be4d68bec81030838e3228ef0238c565af85 (diff)
define inline for Visual Studio
In Visual Studio, inline is available in C++ only, however __inline is available for C, see http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Dr Stephen Henson <steve@openssl.org>
Diffstat (limited to 'e_os.h')
-rw-r--r--e_os.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/e_os.h b/e_os.h
index 0a97895360..ced9483ab0 100644
--- a/e_os.h
+++ b/e_os.h
@@ -379,7 +379,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 */
@@ -754,4 +763,3 @@ struct servent *getservbyname(const char *name, const char *proto);
#endif
#endif
-