From: Matt Caswell <matt@openssl.org>
Date: Fri, 28 Feb 2025 11:52:08 +0000 (+0000)
Subject: Fix a compilation failure in AIX
X-Git-Tag: openssl-3.3.4~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7b28e3fabd85e4fb4b12cb32a6af1aad1684ed6;p=thirdparty%2Fopenssl.git

Fix a compilation failure in AIX

AIX (at least for 7.1)  defines some macros for "events" and "revents" which
interferes with our own use of these names.

Fixes #24236

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26933)

(cherry picked from commit 5eb55ad8a70ef948432ba17e0985c7b4d3b13c25)
---

diff --git a/ssl/rio/poll_immediate.c b/ssl/rio/poll_immediate.c
index 66e613a7dcd..663e4fd91bd 100644
--- a/ssl/rio/poll_immediate.c
+++ b/ssl/rio/poll_immediate.c
@@ -12,6 +12,16 @@
 #include <openssl/err.h>
 #include "../ssl_local.h"
 
+#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
+
 #define ITEM_N(items, stride, n) \
     (*(SSL_POLL_ITEM *)((char *)(items) + (n)*(stride)))