diff options
author | marha <marha@users.sourceforge.net> | 2014-10-19 11:31:33 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-10-19 11:33:30 +0200 |
commit | a14858a22f164b5accc4bd192a5d3de21d88e3d1 (patch) | |
tree | 6a0005fed0f248559139016a7310add07fcb62df /openssl/e_os.h | |
parent | fa5a6df66cfe9b19014ea9d2fca35b762f457041 (diff) | |
download | vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.tar.gz vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.tar.bz2 vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.zip |
Update to openssl-1.0.1j
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 - |