From 67a8abefe75601d0ff3ebe8474a46ef4b37c33e0 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Wed, 25 Feb 2009 19:31:53 +0000
Subject: Include sys/poll.h and poll.h directly if they exist. nbcompat/poll.h
 conflicts with the system header on Solaris and is implicitly included by
 nbcompat.h already, if needed. Fixes PR 40756.

---
 pkgtools/pbulk/files/pbulk/lib/event.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/pbulk/files/pbulk/lib/event.c b/pkgtools/pbulk/files/pbulk/lib/event.c
index 192a0616167..402907a852a 100644
--- a/pkgtools/pbulk/files/pbulk/lib/event.c
+++ b/pkgtools/pbulk/files/pbulk/lib/event.c
@@ -1,4 +1,4 @@
-/* $NetBSD: event.c,v 1.4 2009/01/31 23:25:38 joerg Exp $ */
+/* $NetBSD: event.c,v 1.5 2009/02/25 19:31:53 joerg Exp $ */
 
 /*-
  * Copyright (c) 2007, 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -38,7 +38,12 @@
 #ifdef __sun
 #include <sys/filio.h>
 #endif
-#include <nbcompat/poll.h>
+#if HAVE_POLL_H
+#include <poll.h>
+#endif
+#if HAVE_SYS_POLL_H
+#include <sys/poll.h>
+#endif
 #include <nbcompat/time.h>
 #include <nbcompat/stdlib.h>
 #include <nbcompat/unistd.h>
-- 
cgit v1.2.3