diff options
| author | Jose <jose@zeroc.com> | 2017-03-16 16:11:24 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-03-16 16:11:24 +0100 |
| commit | c6f4057a8975e2312d82f22af59f2069d2b5e8ab (patch) | |
| tree | 1312f2c5798821dd8b4c583f30983542d9528790 /cpp/include/IceSSL/Config.h | |
| parent | Removed C# Ice.BatchRequestInterceptor (ICE-7662) (diff) | |
| download | ice-c6f4057a8975e2312d82f22af59f2069d2b5e8ab.tar.bz2 ice-c6f4057a8975e2312d82f22af59f2069d2b5e8ab.tar.xz ice-c6f4057a8975e2312d82f22af59f2069d2b5e8ab.zip | |
Fixed (ICE-7621) - Refactor IceSSL API to support multiple implementations
Diffstat (limited to 'cpp/include/IceSSL/Config.h')
| -rw-r--r-- | cpp/include/IceSSL/Config.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/cpp/include/IceSSL/Config.h b/cpp/include/IceSSL/Config.h index d6d31fc5cef..9305f9b3784 100644 --- a/cpp/include/IceSSL/Config.h +++ b/cpp/include/IceSSL/Config.h @@ -15,27 +15,12 @@ // // Automatically link IceSSL[D|++11|++11D].lib with Visual C++ // -#if !defined(ICE_BUILDING_ICE_SSL) && defined(ICESSL_API_EXPORTS) -# define ICE_BUILDING_ICE_SSL +#if !defined(ICE_BUILDING_ICESSL) && defined(ICESSL_API_EXPORTS) +# define ICE_BUILDING_ICESSL #endif -#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICE_SSL) -# pragma comment(lib, ICE_LIBNAME("IceSSL")) -#endif - -#if defined(__APPLE__) -# define ICE_USE_SECURE_TRANSPORT 1 -#if defined(__APPLE__) && TARGET_OS_IPHONE != 0 -# define ICE_USE_SECURE_TRANSPORT_IOS 1 -#else -# define ICE_USE_SECURE_TRANSPORT_MACOS 1 -#endif -#elif defined(_WIN32) -# if !defined(ICE_OS_UWP) -# define ICE_USE_SCHANNEL 1 -# endif -#else -# define ICE_USE_OPENSSL 1 +#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICESSL) +# pragma comment(lib, ICE_LIBNAME("IceSSL")) #endif #endif |