From: Randall S. Becker <randall.becker@nexbridge.ca>
Date: Thu, 7 Sep 2023 14:15:21 +0000 (+0100)
Subject: Exclude include of poll.h from NonStop builds - not defined on platform.
X-Git-Tag: openssl-3.2.0-alpha2~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aff99225f946d8f538b5e0cb95fc65d5cd36b99b;p=thirdparty%2Fopenssl.git

Exclude include of poll.h from NonStop builds - not defined on platform.

socket.h has been modified so that poll.h is omitted for OPENSSL_SYS_NONSTOP
builds. The platform configuration is derived from UNIX so the include is
only omitted for NonStop but kept in the OPENSSL_SYS_UNIX include block.

Fixes: #22001

Signed-off-by: Randall S. Becker <randall.becker@nexbridge.ca>

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22006)
---

diff --git a/include/internal/sockets.h b/include/internal/sockets.h
index 27a26184f09..2550c56bd0e 100644
--- a/include/internal/sockets.h
+++ b/include/internal/sockets.h
@@ -117,7 +117,9 @@ typedef size_t socklen_t;        /* Currently appears to be missing on VMS */
 #  endif
 
 #  ifdef OPENSSL_SYS_UNIX
-#    include <poll.h>
+#    ifndef OPENSSL_SYS_TANDEM
+#     include <poll.h>
+#    endif
 #    include <errno.h>
 #  endif