From: Darren Tucker <dtucker@dtucker.net>
Date: Tue, 22 Feb 2022 01:25:52 +0000 (+1100)
Subject: Only include sys/poll.h if we don't have poll.h.
X-Git-Tag: V_8_9_P1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a102e9cb287a43bd7dfe594b775a89a8e94697c;p=thirdparty%2Fopenssh-portable.git

Only include sys/poll.h if we don't have poll.h.

Prevents warnings on MUSL based systems such as Alpine.
---

diff --git a/openbsd-compat/bsd-poll.h b/openbsd-compat/bsd-poll.h
index fb99b66f2..586647ee1 100644
--- a/openbsd-compat/bsd-poll.h
+++ b/openbsd-compat/bsd-poll.h
@@ -33,8 +33,7 @@
 #include <sys/types.h>
 #ifdef HAVE_POLL_H
 # include <poll.h>
-#endif
-#ifdef HAVE_SYS_POLL_H
+#elif HAVE_SYS_POLL_H
 # include <sys/poll.h>
 #endif