summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-09-18 19:20:24 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-09-18 19:20:24 +0000
commit5cf1c127969fc7a3cc5f4bf2462e6e68939340db (patch)
tree926bc02cf4b0be557186916c97b6cf7e48d01d5b /main
parent2498ba75aee981cbb58d26fa820e819fd5b7c90a (diff)
it appears that current Mac OS/X does not need the poll compatibility module at all, and platforms that do need it also need -DPOLLCOMPAT (or they wouldn't have compiled at all)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43207 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/Makefile6
1 files changed, 1 insertions, 5 deletions
diff --git a/main/Makefile b/main/Makefile
index 037a10a45..c1b397803 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -39,6 +39,7 @@ OBJS+=say.o
ifeq ($(wildcard /usr/include/sys/poll.h),)
OBJS+=poll.o
+ ASTCFLAGS+=-DPOLLCOMPAT
endif
ifeq ($(wildcard /usr/include/dlfcn.h),)
@@ -59,11 +60,6 @@ ifneq ($(findstring darwin,$(OSARCH)),)
ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
ASTLINK=-Wl,-dynamic
endif
- # Mac on Intel CoreDuo does not need poll compatibility layer
- ifneq ($(PROC),i386)
- OBJS+=poll.o
- ASTCFLAGS+=-DPOLLCOMPAT
- endif
else
# These are used for all but Darwin
ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)