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);