From: Matt Caswell <matt@openssl.org>
Date: Fri, 30 Jun 2023 15:34:48 +0000 (+0100)
Subject: Don't compile quic_thread_assist.c on OPENSSL_NO_QUIC_THREAD_ASSIST
X-Git-Tag: openssl-3.2.0-alpha1~501
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a2a0e1dc88bf905a7997e12de08a4b45f9db53c;p=thirdparty%2Fopenssl.git

Don't compile quic_thread_assist.c on OPENSSL_NO_QUIC_THREAD_ASSIST

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)
---

diff --git a/ssl/quic/quic_thread_assist.c b/ssl/quic/quic_thread_assist.c
index b2917871abc..b5c1829e8e6 100644
--- a/ssl/quic/quic_thread_assist.c
+++ b/ssl/quic/quic_thread_assist.c
@@ -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)