]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Don't compile quic_thread_assist.c on OPENSSL_NO_QUIC_THREAD_ASSIST
authorMatt Caswell <matt@openssl.org>
Fri, 30 Jun 2023 15:34:48 +0000 (16:34 +0100)
committerPauli <pauli@openssl.org>
Thu, 6 Jul 2023 02:55:21 +0000 (12:55 +1000)
If OPENSSL_NO_QUIC_THREAD_ASSIST is defined then we don't have the right
support for QUIC thread assisted mode so don't attempt to compile that
code.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21332)

ssl/quic/quic_thread_assist.c

index b2917871abc9b1ec45a6bac7856597e9d437703c..b5c1829e8e6012c50098e7f02aca710e9c38e9bd 100644 (file)
@@ -14,7 +14,7 @@
 #include "internal/thread_arch.h"
 #include "internal/quic_thread_assist.h"
 
-#if !defined(OPENSSL_NO_QUIC) && defined(OPENSSL_THREADS)
+#if !defined(OPENSSL_NO_QUIC_THREAD_ASSIST)
 
 /* Main loop for the QUIC assist thread. */
 static unsigned int assist_thread_main(void *arg)