Commit 4f204c1f authored by Dave Watson's avatar Dave Watson Committed by Pavlo Kushnir

Fix bad rebase for SSLContext

Summary: Put back previous liger diffs

Test Plan: It builds

Reviewed By: seanc@fb.com

Subscribers: doug, ssl-diffs@, njormrod, folly-diffs@

FB internal diff: D1652754

Signature: t1:1652754:1414785984:df0fc7bf59dc2e89defd2c1a4ffe3b288238ba58
parent 8160f2fb
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/x509v3.h> #include <openssl/x509v3.h>
#include <folly/SmallLocks.h>
#include <folly/Format.h> #include <folly/Format.h>
#include <folly/io/PortableSpinLock.h> #include <folly/io/PortableSpinLock.h>
...@@ -547,7 +546,13 @@ static void callbackLocking(int mode, int n, const char*, int) { ...@@ -547,7 +546,13 @@ static void callbackLocking(int mode, int n, const char*, int) {
} }
static unsigned long callbackThreadID() { static unsigned long callbackThreadID() {
return static_cast<unsigned long>(pthread_self()); return static_cast<unsigned long>(
#ifdef __APPLE__
pthread_mach_thread_np(pthread_self())
#else
pthread_self()
#endif
);
} }
static CRYPTO_dynlock_value* dyn_create(const char*, int) { static CRYPTO_dynlock_value* dyn_create(const char*, int) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment