[openssh-commits] [openssh] 01/06: Wrap poll.h includes in HAVE_POLL_H.

git+noreply at mindrot.org git+noreply at mindrot.org
Mon Oct 28 19:02:58 AEDT 2019


This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 6fc7e1c6fec3ba589869ae98e968c0e5e2e4695b
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Mon Oct 28 15:53:25 2019 +1100

    Wrap poll.h includes in HAVE_POLL_H.
---
 kex.c               | 2 ++
 misc.c              | 2 ++
 packet.c            | 2 ++
 ssh-pkcs11-helper.c | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/kex.c b/kex.c
index 49d70156..2195cea4 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 88833d7f..78c00eb8 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 817da43b..7a703d69 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 3bcc2440..219ce9b5 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>

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list