Index: Makefile
===================================================================
--- Makefile	(revision 114105)
+++ Makefile	(working copy)
@@ -270,6 +270,7 @@
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   ASTCFLAGS+=-D__Darwin__
+  ASTCFLAGS+=-DPOLLCOMPAT
   AUDIO_LIBS=-framework CoreAudio
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
 else
@@ -278,6 +279,9 @@
   ifneq ($(findstring BSD,$(OSARCH)),)
     LDFLAGS+=-L/usr/local/lib
   endif
+  ifeq ($(wildcard /usr/include/sys/poll.h),)
+    ASTCFLAGS+=-DPOLLCOMPAT
+  endif
 endif
 
 ifeq ($(OSARCH),SunOS)
Index: main/Makefile
===================================================================
--- main/Makefile	(revision 114105)
+++ main/Makefile	(working copy)
@@ -40,11 +40,9 @@
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   OBJS+=poll.o
-  ASTCFLAGS+=-DPOLLCOMPAT
 else
   ifeq ($(wildcard /usr/include/sys/poll.h),)
     OBJS+=poll.o
-    ASTCFLAGS+=-DPOLLCOMPAT
   endif
 endif