From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 13 Jul 2005 18:06:48 +0000 (+0000)
Subject: this is my cheap hack to fix the build problem on darwin since it now has
X-Git-Tag: 1.0.11.1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7491dba5497f43040329eaaf86c3210d4ff7c888;p=thirdparty%2Fasterisk.git

this is my cheap hack to fix the build problem on darwin since it now has
poll.h.  If anyone can think of a cleaner way to handle this, suggestions
are welcome


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@6122 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index bf8090682e..f704a6bd39 100755
--- a/Makefile
+++ b/Makefile
@@ -225,6 +225,8 @@ endif
 CC=gcc
 INSTALL=install
 
+CFLAGS+=$(shell if uname -r|grep -q 8.2.0 ; then echo " -DOSX10_4 " ; fi)
+
 _all: all
 	@echo " +--------- Asterisk Build Complete ---------+"  
 	@echo " + Asterisk has successfully been built, but +"  
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index f99831d38f..bd1674f080 100755
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -19,7 +19,7 @@
 #include <asterisk/chanvars.h>
 #include <unistd.h>
 #include <setjmp.h>
-#if defined(__APPLE__)
+#if !defined(OSX10_4) && defined(__APPLE__)
 #include <asterisk/poll-compat.h>
 #else
 #include <sys/poll.h>
diff --git a/include/asterisk/io.h b/include/asterisk/io.h
index 56fdd8aeb7..f775418a55 100755
--- a/include/asterisk/io.h
+++ b/include/asterisk/io.h
@@ -14,7 +14,7 @@
 #ifndef _IO_H
 #define _IO_H
 
-#ifdef __APPLE__
+#if !defined(OSX10_4) && defined(__APPLE__)
 #include <asterisk/poll-compat.h>
 #else
 #include <sys/poll.h>		/* For POLL* constants */