diff options
| author | Mark Spruiell <mes@zeroc.com> | 2003-02-21 21:24:00 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2003-02-21 21:24:00 +0000 |
| commit | 9d3cb431f997477067757531d8c9b00181a72630 (patch) | |
| tree | 132d41800831c2caa066ed962590c46d1e0dddc3 /cpp/src/IceSSL/OpenSSLPluginI.cpp | |
| parent | bug fix in endpoint parsing (diff) | |
| download | ice-9d3cb431f997477067757531d8c9b00181a72630.tar.bz2 ice-9d3cb431f997477067757531d8c9b00181a72630.tar.xz ice-9d3cb431f997477067757531d8c9b00181a72630.zip | |
portability fixes for openssl, xerces; dependency update
Diffstat (limited to 'cpp/src/IceSSL/OpenSSLPluginI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLPluginI.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp index cce327d4c6e..2953719202b 100644 --- a/cpp/src/IceSSL/OpenSSLPluginI.cpp +++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp @@ -32,7 +32,6 @@ #include <IceSSL/RSAPrivateKey.h> #include <IceSSL/DHParams.h> -#include <openssl/e_os.h> #include <openssl/rand.h> #include <openssl/err.h> @@ -40,9 +39,14 @@ #define OPENSSL_THREAD_DEFINES #include <openssl/opensslconf.h> -#if defined(THREADS) +#if OPENSSL_VERSION_NUMBER < 0x0090700fL +# if !defined(THREADS) +# error "Thread support not enabled" +# endif #else -#error "Thread support not enabled" +# if !defined(OPENSSL_THREADS) +# error "Thread support not enabled" +# endif #endif using namespace std; @@ -771,9 +775,11 @@ IceSSL::OpenSSLPluginI::loadRandFiles(const string& names) strcpy(namesString, names.c_str()); - char seps[5]; - - sprintf(seps, "%c", LIST_SEPARATOR_CHAR); +#ifdef _WIN32 + const char* seps = ";"; +#else + const char* seps = ":"; +#endif char* token = strtok(namesString, seps); |