diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-08-22 17:51:09 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-08-22 17:51:09 +0000 |
| commit | dd26956074b5f43b8530c0bb4d569fcacb1d419b (patch) | |
| tree | 9be686823bd6ffa62372e9a1b8037edb59faee47 /cpp/src/IceSSL/PluginI.cpp | |
| parent | fixing bug 1273: typo in error message (diff) | |
| download | ice-dd26956074b5f43b8530c0bb4d569fcacb1d419b.tar.bz2 ice-dd26956074b5f43b8530c0bb4d569fcacb1d419b.tar.xz ice-dd26956074b5f43b8530c0bb4d569fcacb1d419b.zip | |
fixing bug 1151: extern C function signatures
Diffstat (limited to 'cpp/src/IceSSL/PluginI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/PluginI.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp index 7e7bd1fbe8b..556b24ceea8 100644 --- a/cpp/src/IceSSL/PluginI.cpp +++ b/cpp/src/IceSSL/PluginI.cpp @@ -49,11 +49,14 @@ static IceUtil::StaticMutex staticMutex = ICE_STATIC_MUTEX_INITIALIZER; static int instanceCount = 0; static IceUtil::Mutex* locks = 0; +extern "C" +{ + // // OpenSSL mutex callback. // -static void -opensslLockCallback(int mode, int n, const char* file, int line) +void +IceSSL_opensslLockCallback(int mode, int n, const char* file, int line) { if(mode & CRYPTO_LOCK) { @@ -68,8 +71,8 @@ opensslLockCallback(int mode, int n, const char* file, int line) // // OpenSSL thread id callback. // -static unsigned long -opensslThreadIdCallback() +unsigned long +IceSSL_opensslThreadIdCallback() { #if defined(_WIN32) return static_cast<unsigned long>(GetCurrentThreadId()); @@ -88,6 +91,8 @@ opensslThreadIdCallback() #endif } +} + // // Plugin implementation. // @@ -154,8 +159,8 @@ IceSSL::PluginI::setupSSL(const CommunicatorPtr& communicator) // Create the mutexes and set the callbacks. // locks = new IceUtil::Mutex[CRYPTO_num_locks()]; - CRYPTO_set_locking_callback(opensslLockCallback); - CRYPTO_set_id_callback(opensslThreadIdCallback); + CRYPTO_set_locking_callback(IceSSL_opensslLockCallback); + CRYPTO_set_id_callback(IceSSL_opensslThreadIdCallback); // // Load human-readable error messages. |