Commit b1cab70b2c85c77cb7214fac86ae498766337ce1
2018-05-30T02:15:09
streams: openssl: add missing check on OPENSSL_LEGACY_API The `CRYPTO_THREADID` type is no longer available in OpenSSL ≥ 1.1.0 with deprecated features disabled, and causes build failures. Since the `threadid_cb()` function is only ever called by `git_openssl_set_locking()` when `defined(OPENSSL_LEGACY_API)`, only define it then.
diff --git a/src/streams/openssl.c b/src/streams/openssl.c
index 8cce844..103e45f 100644
--- a/src/streams/openssl.c
+++ b/src/streams/openssl.c
@@ -249,7 +249,7 @@ int git_openssl_stream_global_init(void)
return 0;
}
-#if defined(GIT_THREADS)
+#if defined(GIT_THREADS) && defined(OPENSSL_LEGACY_API)
static void threadid_cb(CRYPTO_THREADID *threadid)
{
GIT_UNUSED(threadid);