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 bf8090682ece16686dffc7ca312943df7c59eb06..f704a6bd39515de07af59ee5e912f4d24b481655 100755 (executable)
--- 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 f99831d38fdf43ce80bbb4911173b3181fa0ce5a..bd1674f080383a8776f334f35406b78577061c8e 100755 (executable)
--- 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 56fdd8aeb71e31322184f75ea111372ebd105daa..f775418a558e331ec16b367067af09fbb597707d 100755 (executable)
--- 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 */