From: sashan <anedvedicky@gmail.com>
Date: Fri, 11 Apr 2025 15:42:31 +0000 (+0200)
Subject: Fix build failure on AIX
X-Git-Tag: openssl-3.4.2~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdc4a1620a68f2293bdb2679a2b315ecf92ebe5f;p=thirdparty%2Fopenssl.git

Fix build failure on AIX

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27354)

(cherry picked from commit e11fdd8293c5e13e09c817b89b9c3d4c1a46d857)
---

diff --git a/test/quic_multistream_test.c b/test/quic_multistream_test.c
index 9659d84d81e..a03bf32c353 100644
--- a/test/quic_multistream_test.c
+++ b/test/quic_multistream_test.c
@@ -25,6 +25,16 @@
 
 static const char *certfile, *keyfile;
 
+#if defined(_AIX)
+/*
+ * Some versions of AIX define macros for events and revents for use when
+ * accessing pollfd structures (see Github issue #24236). That interferes
+ * with our use of these names here. We simply undef them.
+ */
+# undef revents
+# undef events
+#endif
+
 #if defined(OPENSSL_THREADS)
 struct child_thread_args {
     struct helper *h;