]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Exclude include of poll.h from NonStop builds - not defined on platform.
authorRandall S. Becker <randall.becker@nexbridge.ca>
Thu, 7 Sep 2023 14:15:21 +0000 (15:15 +0100)
committerHugo Landau <hlandau@openssl.org>
Fri, 8 Sep 2023 16:21:38 +0000 (17:21 +0100)
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)

include/internal/sockets.h

index 27a26184f09d6334cc23dc2cdcda3d9fbff69f47..2550c56bd0ed9c3c6368667ac3f36c7da3cfa64f 100644 (file)
@@ -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