[pkgsrc/trunk]: pkgsrc/pkgtools/pbulk/files/pbulk/lib Include sys/poll.h and ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/22cb261ee0f7
branches:  trunk
changeset: 555184:22cb261ee0f7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Feb 25 19:31:53 2009 +0000

description:
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.

diffstat:

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

diffs (23 lines):

diff -r 437d9dbfbf86 -r 22cb261ee0f7 pkgtools/pbulk/files/pbulk/lib/event.c
--- a/pkgtools/pbulk/files/pbulk/lib/event.c    Wed Feb 25 19:26:58 2009 +0000
+++ b/pkgtools/pbulk/files/pbulk/lib/event.c    Wed Feb 25 19:31:53 2009 +0000
@@ -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@localhost>.
@@ -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>