Repository: thrift Updated Branches: refs/heads/master 9921300de -> 54a2e6452
THRIFT-3206 Fix Visual Studio build failure due 'pthread_self': identifier not found Patch: PaweÅ Janicki Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/54a2e645 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/54a2e645 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/54a2e645 Branch: refs/heads/master Commit: 54a2e6452fbaed5a82e3b9a8504cf2850d4da191 Parents: 9921300 Author: Roger Meier <[email protected]> Authored: Sun Nov 29 16:58:15 2015 +0100 Committer: Roger Meier <[email protected]> Committed: Sun Nov 29 16:58:15 2015 +0100 ---------------------------------------------------------------------- lib/cpp/src/thrift/transport/TSSLSocket.cpp | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/54a2e645/lib/cpp/src/thrift/transport/TSSLSocket.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.cpp b/lib/cpp/src/thrift/transport/TSSLSocket.cpp index 6e9a4de..8e56426 100644 --- a/lib/cpp/src/thrift/transport/TSSLSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSSLSocket.cpp @@ -74,7 +74,11 @@ static void callbackLocking(int mode, int n, const char*, int) { #if (OPENSSL_VERSION_NUMBER < OPENSSL_VERSION_NO_THREAD_ID) static unsigned long callbackThreadID() { +#ifdef _WIN32 + return (unsigned long)GetCurrentThreadId(); +#else return (unsigned long)pthread_self(); +#endif } #endif
