diff options
Diffstat (limited to 'openssl/e_os.h')
| -rw-r--r-- | openssl/e_os.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/openssl/e_os.h b/openssl/e_os.h index 6a0aad1de..733155e48 100644 --- a/openssl/e_os.h +++ b/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 - |