From 2c9953bbd35bf0da36c224b0c8dbd3847adbe5db Mon Sep 17 00:00:00 2001
From: Hugo Landau <hlandau@openssl.org>
Date: Mon, 29 Apr 2024 10:20:39 +0100
Subject: [PATCH] Minor fixes

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24971)
---
 ssl/quic/quic_impl.c | 2 ++
 ssl/rio/build.info   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index ed0fa4ceaa3..cc1f8395530 100644
--- a/ssl/quic/quic_impl.c
+++ b/ssl/quic/quic_impl.c
@@ -4308,7 +4308,9 @@ SSL *ossl_quic_new_listener_from(SSL *ssl, uint64_t flags)
 
     ql->domain  = ctx.qd;
     ql->engine  = ctx.qd->engine;
+#if defined(OPENSSL_THREADS)
     ql->mutex   = ctx.qd->mutex;
+#endif
 
     /* TODO(QUIC SERVER): Implement SSL_LISTENER_FLAG_NO_ACCEPT */
 
diff --git a/ssl/rio/build.info b/ssl/rio/build.info
index 33e0dc13adc..15f93fb07d5 100644
--- a/ssl/rio/build.info
+++ b/ssl/rio/build.info
@@ -1,4 +1,6 @@
 $LIBSSL=../../libssl
 
 SOURCE[$LIBSSL]=poll_immediate.c
-SOURCE[$LIBSSL]=rio_notifier.c
+IF[{- !$disabled{quic} -}]
+  SOURCE[$LIBSSL]=rio_notifier.c
+ENDIF
-- 
2.47.2