diff options
Diffstat (limited to 'crypto/openssl/e_os.h')
-rw-r--r-- | crypto/openssl/e_os.h | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/crypto/openssl/e_os.h b/crypto/openssl/e_os.h index 79c139257340..4df285b5b5a0 100644 --- a/crypto/openssl/e_os.h +++ b/crypto/openssl/e_os.h @@ -290,7 +290,7 @@ extern "C" { # ifdef _WIN64 # define strlen(s) _strlen31(s) /* cut strings to 2GB */ -static unsigned int _strlen31(const char *str) +static __inline unsigned int _strlen31(const char *str) { unsigned int len=0; while (*str && len<0x80000000U) str++, len++; @@ -368,6 +368,15 @@ static unsigned int _strlen31(const char *str) # define DEFAULT_HOME "C:" # endif +/* Avoid Visual Studio 13 GetVersion deprecated problems */ +#if defined(_MSC_VER) && _MSC_VER>=1800 +# define check_winnt() (1) +# define check_win_minplat(x) (1) +#else +# define check_winnt() (GetVersion() < 0x80000000) +# define check_win_minplat(x) (LOBYTE(LOWORD(GetVersion())) >= (x)) +#endif + #else /* The non-microsoft world */ # ifdef OPENSSL_SYS_VMS @@ -725,10 +734,25 @@ struct servent *getservbyname(const char *name, const char *proto); #include <OS.h> #endif +#if !defined(inline) && !defined(__cplusplus) +# if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L + /* do nothing, inline works */ +# elif defined(__GNUC__) && __GNUC__>=2 +# define inline __inline__ +# elif defined(_MSC_VER) + /* + * Visual Studio: inline is available in C++ only, however + * __inline is available for C, see + * http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx + */ +# define inline __inline +# else +# define inline +# endif +#endif #ifdef __cplusplus } #endif #endif - |