diff options
| author | Jose <jose@zeroc.com> | 2016-03-17 16:49:14 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-17 16:49:14 +0100 |
| commit | 98246aab384d4ef1e20c33114db43a09c7c84f2e (patch) | |
| tree | 1eb9b12c1aaacb33a146c23b6be721c1e94d9bed | |
| parent | Update Ice Builder for Gradle version to 1.2.1 (diff) | |
| download | ice-98246aab384d4ef1e20c33114db43a09c7c84f2e.tar.bz2 ice-98246aab384d4ef1e20c33114db43a09c7c84f2e.tar.xz ice-98246aab384d4ef1e20c33114db43a09c7c84f2e.zip | |
Windows IceSSL/configuration test fix
| -rw-r--r-- | cpp/test/IceSSL/configuration/AllTests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index c1baaf93db2..4a0cad36e52 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -1353,7 +1353,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b // OpenSSL < 1.0 doesn't support tls 1.1 so it will also fail, we ignore in this // case. // -#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L +#if defined(ICE_USE_SCHANNEL) || (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L) cerr << ex << endl; test(false); #endif |