From: Randall S. Becker <randall.becker@nexbridge.ca>
Date: Wed, 12 Feb 2025 14:40:59 +0000 (+0000)
Subject: Wrap use of poll.h to prevent including on NonStop.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff030ad5bd1c6196e640b1338dac23c1ce3a3154;p=thirdparty%2Fopenssl.git

Wrap use of poll.h to prevent including on NonStop.

Fixes: #26724

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

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
(Merged from https://github.com/openssl/openssl/pull/26726)
---

diff --git a/include/internal/sockets.h b/include/internal/sockets.h
index 8e2f4414b52..d28208b3134 100644
--- a/include/internal/sockets.h
+++ b/include/internal/sockets.h
@@ -98,7 +98,6 @@ typedef size_t socklen_t;        /* Currently appears to be missing on VMS */
 #   include <in.h>
 #   include <inet.h>
 #  else
-#   include <poll.h>
 #   include <sys/socket.h>
 #   if !defined(NO_SYS_UN_H) && defined(AF_UNIX) && !defined(OPENSSL_NO_UNIX_SOCK)
 #    include <sys/un.h>