From b66a4039419a54ae4805c93195844e6393bff763 Mon Sep 17 00:00:00 2001
From: crs <cschoeneman@gmail.com>
Date: Sat, 31 Jul 2004 11:19:39 +0000
Subject: [PATCH] Now using <poll.h> instead of <sys/poll.h>.  Also added a bit
 to autoconf to ensure we don't use poll on OS X.

---
 acinclude.m4                               | 7 +++++--
 lib/arch/CArchNetworkBSD.cpp               | 2 +-
 lib/platform/CXWindowsEventQueueBuffer.cpp | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index d368949b..12d80bda 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -130,8 +130,11 @@ AC_DEFUN([ACX_CHECK_GETPWUID_R], [
 
 AC_DEFUN([ACX_CHECK_POLL], [
     AC_MSG_CHECKING([for poll])
-    AC_TRY_LINK([#include <sys/poll.h>],
-            	[struct pollfd ufds[] = { 0, POLLIN, 0 }; poll(ufds, 1, 10);],
+    AC_TRY_LINK([#include <poll.h>],
+				[#if defined(_POLL_EMUL_H_)
+				#error emulated poll
+				#endif
+            	struct pollfd ufds[] = { 0, POLLIN, 0 }; poll(ufds, 1, 10);],
             	acx_poll_ok=yes, acx_poll_ok=no)
 	AC_MSG_RESULT($acx_poll_ok)
 	if test x"$acx_poll_ok" = xyes; then
diff --git a/lib/arch/CArchNetworkBSD.cpp b/lib/arch/CArchNetworkBSD.cpp
index e2efc8da..2432c9e0 100644
--- a/lib/arch/CArchNetworkBSD.cpp
+++ b/lib/arch/CArchNetworkBSD.cpp
@@ -30,7 +30,7 @@
 #include <string.h>
 
 #if HAVE_POLL
-#	include <sys/poll.h>
+#	include <poll.h>
 #	if HAVE_ALLOCA_H
 #		include <alloca.h>
 #	endif
diff --git a/lib/platform/CXWindowsEventQueueBuffer.cpp b/lib/platform/CXWindowsEventQueueBuffer.cpp
index f1ef5551..170e5bc6 100644
--- a/lib/platform/CXWindowsEventQueueBuffer.cpp
+++ b/lib/platform/CXWindowsEventQueueBuffer.cpp
@@ -18,7 +18,7 @@
 #include "CEvent.h"
 #include "IEventQueue.h"
 #if HAVE_POLL
-#	include <sys/poll.h>
+#	include <poll.h>
 #else
 #	if HAVE_SYS_SELECT_H
 #		include <sys/select.h>