aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGacko <gacko28@gmx.de>2014-01-22 21:44:15 +0100
committerGacko <gacko28@gmx.de>2014-01-22 21:46:41 +0100
commit678814836d215580e138e69cd334b4f35ed94270 (patch)
tree73f3001f1e96a6d006788f58fa5a18b77ca18435
parent0db2549775ea252ab92c999fd557f9965286cb91 (diff)
Shared/OpenSSLCrypto: Add switch to fix build under Mac
-rw-r--r--src/server/shared/Cryptography/OpenSSLCrypto.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/server/shared/Cryptography/OpenSSLCrypto.cpp b/src/server/shared/Cryptography/OpenSSLCrypto.cpp
index 10ea595640a..bd72459e9df 100644
--- a/src/server/shared/Cryptography/OpenSSLCrypto.cpp
+++ b/src/server/shared/Cryptography/OpenSSLCrypto.cpp
@@ -33,7 +33,12 @@ static void lockingCallback(int mode, int type, const char* /*file*/, int /*line
static void threadIdCallback(CRYPTO_THREADID * id)
{
+/// ACE_thread_t turns out to be a struct under Mac OS.
+#ifndef __APPLE__
CRYPTO_THREADID_set_numeric(id, ACE_Thread::self());
+#else
+ CRYPTO_THREADID_set_pointer(id, ACE_Thread::self());
+#endif
}
void OpenSSLCrypto::threadsSetup()