diff options
| author | Emilia Kasper <emilia@openssl.org> | 2014-08-19 13:18:07 +0200 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2014-08-21 16:08:05 +0200 |
| commit | 4ff9cbe635c28109bc395346c25148170b4d491b (patch) | |
| tree | dcca34f8f0aabcc0ae5c03dd061bd7a7baf6e070 | |
| parent | e164b34079dc56afe35c227fdb34604c6a37db7d (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>
(cherry picked from commit f511b25a7370c775dc9fd6198dbacd1706cf242b)
| -rw-r--r-- | e_os.h | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -376,7 +376,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 */ @@ -750,4 +759,3 @@ struct servent *getservbyname(const char *name, const char *proto); #endif #endif - |