From: Darren Tucker <dtucker@dtucker.net>
Date: Mon, 28 Oct 2019 04:53:25 +0000 (+1100)
Subject: Wrap poll.h includes in HAVE_POLL_H.
X-Git-Tag: V_8_2_P1~399
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fc7e1c6fec3ba589869ae98e968c0e5e2e4695b;p=thirdparty%2Fopenssh-portable.git

Wrap poll.h includes in HAVE_POLL_H.
---

diff --git a/kex.c b/kex.c
index 49d701568..2195cea4e 100644
--- a/kex.c
+++ b/kex.c
@@ -33,7 +33,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#ifdef HAVE_POLL_H
 #include <poll.h>
+#endif
 
 #ifdef WITH_OPENSSL
 #include <openssl/crypto.h>
diff --git a/misc.c b/misc.c
index 88833d7ff..78c00eb8e 100644
--- a/misc.c
+++ b/misc.c
@@ -38,7 +38,9 @@
 #ifdef HAVE_LIBGEN_H
 # include <libgen.h>
 #endif
+#ifdef HAVE_POLL_H
 #include <poll.h>
+#endif
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/packet.c b/packet.c
index 817da43b5..7a703d695 100644
--- a/packet.c
+++ b/packet.c
@@ -58,7 +58,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <limits.h>
+#ifdef HAVE_POLL_H
 #include <poll.h>
+#endif
 #include <signal.h>
 #include <time.h>
 
diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c
index 3bcc2440b..219ce9b5d 100644
--- a/ssh-pkcs11-helper.c
+++ b/ssh-pkcs11-helper.c
@@ -26,7 +26,9 @@
 
 #include <stdlib.h>
 #include <errno.h>
+#ifdef HAVE_POLL_H
 #include <poll.h>
+#endif
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>