diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-09 14:06:36 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-13 09:50:04 +0000 |
| commit | 8b8a48d099e6ae985f80cbbdad566e2b8aaf96a3 (patch) | |
| tree | 00a33b71d48b62bda5b1d31a3c0f720e50ab0d19 /e_os.h | |
| parent | 09caf4ffcd5c45bef9012aa53cc64ef5c8b1067f (diff) | |
Avoid deprecation problems in Visual Studio 13
Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 86d21d0b9577322ac5da0114c5fac16eb49b4cef)
Conflicts:
e_os.h
Diffstat (limited to 'e_os.h')
| -rw-r--r-- | e_os.h | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -360,12 +360,14 @@ static __inline unsigned int _strlen31(const char *str) # define DEFAULT_HOME "C:" # endif -/* Avoid Windows 8 SDK GetVersion deprecated problems */ +/* 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) -#endif +# define check_win_minplat(x) (LOBYTE(LOWORD(GetVersion())) >= (x)) +#endif #else /* The non-microsoft world */ |