diff options
| author | Jose <jose@zeroc.com> | 2017-04-28 21:03:30 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-04-28 21:03:30 +0200 |
| commit | 6c0f3ce3c6d5cee59bc638fc89806ce816f23bff (patch) | |
| tree | 3088f454c512c6dc6739f010a73090786ab51620 | |
| parent | Fix gitter url (diff) | |
| download | ice-6c0f3ce3c6d5cee59bc638fc89806ce816f23bff.tar.bz2 ice-6c0f3ce3c6d5cee59bc638fc89806ce816f23bff.tar.xz ice-6c0f3ce3c6d5cee59bc638fc89806ce816f23bff.zip | |
Fix (ICE-7846) - Add Ice::registerIceSSLOpenSSL to IceSSL/OpenSSL.h
| -rw-r--r-- | cpp/include/IceSSL/OpenSSL.h | 10 | ||||
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLPluginI.cpp | 11 |
2 files changed, 21 insertions, 0 deletions
diff --git a/cpp/include/IceSSL/OpenSSL.h b/cpp/include/IceSSL/OpenSSL.h index 66fe89b2302..8de814d1d5c 100644 --- a/cpp/include/IceSSL/OpenSSL.h +++ b/cpp/include/IceSSL/OpenSSL.h @@ -38,6 +38,16 @@ # endif #endif +#if defined(_WIN32) && !defined(ICESSL_OPENSSL_API_EXPORTS) + +namespace Ice +{ + +ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceSSLOpenSSL(bool = true); + +} +#endif + namespace IceSSL { diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp index fe8ffec9b8c..f7ed6a17f2d 100644 --- a/cpp/src/IceSSL/OpenSSLPluginI.cpp +++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp @@ -93,6 +93,17 @@ createIceSSLOpenSSL(const Ice::CommunicatorPtr& communicator, const string& /*na return new PluginI(communicator); } +namespace Ice +{ + +ICESSL_OPENSSL_API void +registerIceSSLOpenSSL(bool loadOnInitialize) +{ + Ice::registerPluginFactory("IceSSL", createIceSSLOpenSSL, loadOnInitialize); +} + +} + #else extern "C" ICESSL_API Ice::Plugin* |