diff options
| author | Quentin Minster <laomaiweng@minster.io> | 2018-05-30 02:15:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 02:15:09 +0200 |
| commit | b1cab70b2c85c77cb7214fac86ae498766337ce1 (patch) | |
| tree | e8d05fd4906de03b2d832ba3f32303d4ab4b61f3 | |
| parent | 7f6c1ce9760c6c397e94d4eba506faeb95452702 (diff) | |
| download | libgit2-b1cab70b2c85c77cb7214fac86ae498766337ce1.tar.gz | |
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.
| -rw-r--r-- | src/streams/openssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/streams/openssl.c b/src/streams/openssl.c index 8cce844d1..103e45f51 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); |