diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2015-10-24 11:06:31 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2015-10-24 11:06:31 -0400 |
| commit | 7d861ea0debf944cb8e3e38d73a8c0197de574b3 (patch) | |
| tree | ed87d21ffe040bf296d2230c7490abda8e34752c /src/c/openssl.c | |
| parent | 598756dc69f89cf2dd2b889cad63a7a690ae7ed7 (diff) | |
| parent | cb0109804fdad0dd423bb344446344cdc08c0886 (diff) | |
Merge branch 'upstream' into dfsg_clean20151018+dfsg
Diffstat (limited to 'src/c/openssl.c')
| -rw-r--r-- | src/c/openssl.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/c/openssl.c b/src/c/openssl.c index 6d018707..206a3bc8 100644 --- a/src/c/openssl.c +++ b/src/c/openssl.c @@ -34,9 +34,15 @@ static void random_password() { } // OpenSSL callbacks +#ifdef PTHREAD_T_IS_POINTER +# define CRYPTO_THREADID_SET CRYPTO_THREADID_set_pointer +#else +# define CRYPTO_THREADID_SET CRYPTO_THREADID_set_numeric +#endif static void thread_id(CRYPTO_THREADID *const result) { - CRYPTO_THREADID_set_numeric(result, pthread_self()); + CRYPTO_THREADID_SET(result, pthread_self()); } +#undef CRYPTO_THREADID_SET static void lock_or_unlock(const int mode, const int type, const char *file, const int line) { pthread_mutex_t *const lock = &openssl_locks[type]; |