summaryrefslogtreecommitdiff
path: root/ruby/src/IceRuby/Init.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ruby/src/IceRuby/Init.cpp')
-rw-r--r--ruby/src/IceRuby/Init.cpp17
1 files changed, 5 insertions, 12 deletions
diff --git a/ruby/src/IceRuby/Init.cpp b/ruby/src/IceRuby/Init.cpp
index 5520de7d9fe..a0c2663f4ed 100644
--- a/ruby/src/IceRuby/Init.cpp
+++ b/ruby/src/IceRuby/Init.cpp
@@ -19,6 +19,8 @@
#include <Endpoint.h>
#include <ValueFactoryManager.h>
+#include <Ice/RegisterPlugins.h>
+
using namespace std;
using namespace IceRuby;
@@ -27,21 +29,12 @@ static VALUE iceModule;
extern "C"
{
-#ifdef ICE_STATIC_LIBS
-Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
-Ice::Plugin* createIceDiscovery(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&);
-Ice::Plugin* createIceLocatorDiscovery(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&);
-#endif
-
void
ICE_DECLSPEC_EXPORT Init_IceRuby()
{
-#ifdef ICE_STATIC_LIBS
- // Register the plugins manually if we're building with static libraries.
- Ice::registerPluginFactory("IceSSL", createIceSSL, false);
- Ice::registerPluginFactory("IceDiscovery", createIceDiscovery, false);
- Ice::registerPluginFactory("IceLocatorDiscovery", createIceLocatorDiscovery, false);
-#endif
+ Ice::registerIceSSL(false);
+ Ice::registerIceDiscovery(false);
+ Ice::registerIceLocatorDiscovery(false);
iceModule = rb_define_module("Ice");
initCommunicator(iceModule);