From e494dcd8c5f230f32bb33c76ce59bfe03a25fb2b Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com" <wtc%netscape.com>
Date: Wed, 25 Nov 1998 21:01:14 +0000
Subject: [PATCH] Removed -D_PR_NEED_FAKE_POLL from FreeBSD.mk and NEXTSTEP.mk.
  This macro is defined internally. In _freebsd.h, include poll.h if poll is
 available. Thanks to Jeremy Lea <reg@shale.csir.co.za> for suggesting the
 patches.

---
 nsprpub/config/FreeBSD.mk        | 2 +-
 nsprpub/config/NEXTSTEP.mk       | 2 +-
 nsprpub/pr/include/md/_freebsd.h | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nsprpub/config/FreeBSD.mk b/nsprpub/config/FreeBSD.mk
index 048e6e38675..4a7f1d06409 100644
--- a/nsprpub/config/FreeBSD.mk
+++ b/nsprpub/config/FreeBSD.mk
@@ -33,7 +33,7 @@ OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DFREEBSD -DHAVE_S
 ifeq ($(USE_PTHREADS),1)
 IMPL_STRATEGY		= _PTH
 OS_LIBS			= -lc_r
-DEFINES			+= -D_THREAD_SAFE -D_PR_NEED_FAKE_POLL
+DEFINES			+= -D_THREAD_SAFE
 else
 IMPL_STRATEGY		= _EMU
 OS_LIBS			= -lc
diff --git a/nsprpub/config/NEXTSTEP.mk b/nsprpub/config/NEXTSTEP.mk
index 7f6f4fe5b46..88d7d1f75cf 100644
--- a/nsprpub/config/NEXTSTEP.mk
+++ b/nsprpub/config/NEXTSTEP.mk
@@ -41,7 +41,7 @@ CPU_ARCH		:= $(shell uname -p)
 
 OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -fno-common -pipe -DNEXTSTEP -DHAVE_STRERROR -DHAVE_BSD_FLOCK -D_POSIX_SOURCE -traditional-cpp -posix
 
-DEFINES			+= -D_PR_LOCAL_THREADS_ONLY -D_PR_NEED_FAKE_POLL
+DEFINES			+= -D_PR_LOCAL_THREADS_ONLY
 
 ARCH			= $(CPU_ARCH)
 
diff --git a/nsprpub/pr/include/md/_freebsd.h b/nsprpub/pr/include/md/_freebsd.h
index 1817a5a84ec..e68b3c4e97a 100644
--- a/nsprpub/pr/include/md/_freebsd.h
+++ b/nsprpub/pr/include/md/_freebsd.h
@@ -204,6 +204,7 @@ extern PRIntervalTime _PR_UNIX_TicksPerSecond(void);
 #define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv)
 
 #if defined(_PR_POLL_AVAILABLE)
+#include <poll.h>
 #define _MD_POLL(fds,nfds,timeout) syscall(SYS_poll,fds,nfds,timeout)
 #endif