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)
This commit is contained in:
Emilia Kasper 2014-08-19 13:18:07 +02:00
parent bcdd904c6c
commit 41a765182f

12
e_os.h
View File

@ -373,7 +373,16 @@ static unsigned int _strlen31(const char *str)
# define check_winnt() (1) # define check_winnt() (1)
#else #else
# define check_winnt() (GetVersion() < 0x80000000) # 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 */ #else /* The non-microsoft world */
@ -738,4 +747,3 @@ struct servent *getservbyname(const char *name, const char *proto);
#endif #endif
#endif #endif