diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-23 19:23:17 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-23 19:23:17 +0100 |
| commit | b61bf8f01f6ec9298df6b94eb31cadbde72c4b57 (patch) | |
| tree | bff89cba8127f8a353b9bed8b700acaf4c1f064f /src/server/shared/Cryptography/OpenSSLCrypto.cpp | |
| parent | f1e1a5cad0fb32fea2aebdc864eb72005594c60c (diff) | |
| parent | f731116766268a38a58572e57cc8abbac400c5ca (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
Diffstat (limited to 'src/server/shared/Cryptography/OpenSSLCrypto.cpp')
| -rw-r--r-- | src/server/shared/Cryptography/OpenSSLCrypto.cpp | 5 |
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() |