diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-05-11 13:45:01 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-05-11 13:45:01 +0200 |
| commit | 6570554c0f03426538d6276ae19519e17777764e (patch) | |
| tree | 5d2d96895909630f65b830018905ad9b36ef1d8d /cpp/src/IceSSL | |
| parent | ICE-6496 Fix formatting issues in LICENSE files (diff) | |
| download | ice-6570554c0f03426538d6276ae19519e17777764e.tar.bz2 ice-6570554c0f03426538d6276ae19519e17777764e.tar.xz ice-6570554c0f03426538d6276ae19519e17777764e.zip | |
Better fix for VS2008 / Python build
Diffstat (limited to 'cpp/src/IceSSL')
| -rw-r--r-- | cpp/src/IceSSL/SChannelEngine.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SSLEngine.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp index 107544e683a..506aa141974 100644 --- a/cpp/src/IceSSL/SChannelEngine.cpp +++ b/cpp/src/IceSSL/SChannelEngine.cpp @@ -54,12 +54,6 @@ struct CertChainEngineConfig HCERTSTORE hExclusiveTrustedPeople; }; -# if defined(_MSC_VER) && (_MSC_VER <= 1500) -# define SP_PROT_TLS1_2_CLIENT 0x00000800 -# define SP_PROT_TLS1_2_SERVER 0x00000400 -# define SP_PROT_TLS1_1_CLIENT 0x00000200 -# define SP_PROT_TLS1_1_SERVER 0x00000100 -# endif #endif void diff --git a/cpp/src/IceSSL/SSLEngine.h b/cpp/src/IceSSL/SSLEngine.h index 09f060cbabb..a85c956fb6f 100644 --- a/cpp/src/IceSSL/SSLEngine.h +++ b/cpp/src/IceSSL/SSLEngine.h @@ -139,7 +139,7 @@ private: #elif defined(ICE_USE_SCHANNEL) -#ifdef __MINGW32__ +#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER <= 1500)) // // Add some definitions missing from MinGW headers. |