diff options
| author | jkim <jkim@FreeBSD.org> | 2014-04-10 22:39:22 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-04-10 22:39:22 +0000 |
| commit | aeb5a4ff70fa036e3502afc9daf7d02795216340 (patch) | |
| tree | c5b5657bc6509d897204957128bcbeac4535b4b7 /crypto/openssl/e_os.h | |
| parent | 8f4a94c1c91787a4ac5272d05fa061275e720a27 (diff) | |
| download | FreeBSD-src-aeb5a4ff70fa036e3502afc9daf7d02795216340.zip FreeBSD-src-aeb5a4ff70fa036e3502afc9daf7d02795216340.tar.gz | |
MFC: r261037, r264278
Merge OpenSSL 1.0.1f and 1.0.1g.
Diffstat (limited to 'crypto/openssl/e_os.h')
| -rw-r--r-- | crypto/openssl/e_os.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/openssl/e_os.h b/crypto/openssl/e_os.h index 79c1392..6a0aad1 100644 --- a/crypto/openssl/e_os.h +++ b/crypto/openssl/e_os.h @@ -368,6 +368,13 @@ static unsigned int _strlen31(const char *str) # define DEFAULT_HOME "C:" # endif +/* Avoid Windows 8 SDK GetVersion deprecated problems */ +#if defined(_MSC_VER) && _MSC_VER>=1800 +# define check_winnt() (1) +#else +# define check_winnt() (GetVersion() < 0x80000000) +#endif + #else /* The non-microsoft world */ # ifdef OPENSSL_SYS_VMS |
