[openssh-commits] [openssh] 01/01: skip bsd-poll.h if poll.h found; ok dtucker

[git+noreply at mindrot.org]

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

djm pushed a commit to branch master
in repository openssh.

commit c64b62338b46ffa08839f05f21ad69fa6234dc17
Author: Damien Miller <djm at mindrot.org>
Date:   Mon Oct 10 12:32:43 2022 +1100

    skip bsd-poll.h if poll.h found; ok dtucker
---
 openbsd-compat/bsd-poll.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openbsd-compat/bsd-poll.h b/openbsd-compat/bsd-poll.h
index 586647ee..db365af2 100644
--- a/openbsd-compat/bsd-poll.h
+++ b/openbsd-compat/bsd-poll.h
@@ -35,7 +35,7 @@
 # include <poll.h>
 #elif HAVE_SYS_POLL_H
 # include <sys/poll.h>
-#endif
+#else
 
 #ifndef HAVE_STRUCT_POLLFD_FD
 typedef struct pollfd {
@@ -73,5 +73,5 @@ int   poll(struct pollfd *, nfds_t, int);
 #ifndef HAVE_PPOLL
 int   ppoll(struct pollfd *, nfds_t, const struct timespec *, const sigset_t *);
 #endif
-
+#endif /* !HAVE_POLL_H && !HAVE_SYS_POLL_H */
 #endif /* !_COMPAT_POLL_H_ */

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