Merge pull request libgit2#4661 from laomaiweng/patch-1

pks-t · web-flow · commit 8a14846b6622 · 2018-05-30T10:51:10.000+02:00
streams: openssl: add missing check on OPENSSL_LEGACY_API
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ int git_openssl_stream_global_init(void)`
`249`	`249`	`return 0;`
`250`	`250`	`}`
`251`	`251`
`252`		`-#if defined(GIT_THREADS)`
	`252`	`+#if defined(GIT_THREADS) && defined(OPENSSL_LEGACY_API)`
`253`	`253`	`static void threadid_cb(CRYPTO_THREADID *threadid)`
`254`	`254`	`{`
`255`	`255`	`GIT_UNUSED(threadid);`