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
This commit is contained in:
Russell Bryant
2005-07-13 18:06:48 +00:00
parent 3e7d040f3f
commit 7491dba549
3 changed files with 4 additions and 2 deletions

View File

@@ -225,6 +225,8 @@ endif
CC=gcc CC=gcc
INSTALL=install INSTALL=install
CFLAGS+=$(shell if uname -r|grep -q 8.2.0 ; then echo " -DOSX10_4 " ; fi)
_all: all _all: all
@echo " +--------- Asterisk Build Complete ---------+" @echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, but +" @echo " + Asterisk has successfully been built, but +"

View File

@@ -19,7 +19,7 @@
#include <asterisk/chanvars.h> #include <asterisk/chanvars.h>
#include <unistd.h> #include <unistd.h>
#include <setjmp.h> #include <setjmp.h>
#if defined(__APPLE__) #if !defined(OSX10_4) && defined(__APPLE__)
#include <asterisk/poll-compat.h> #include <asterisk/poll-compat.h>
#else #else
#include <sys/poll.h> #include <sys/poll.h>

View File

@@ -14,7 +14,7 @@
#ifndef _IO_H #ifndef _IO_H
#define _IO_H #define _IO_H
#ifdef __APPLE__ #if !defined(OSX10_4) && defined(__APPLE__)
#include <asterisk/poll-compat.h> #include <asterisk/poll-compat.h>
#else #else
#include <sys/poll.h> /* For POLL* constants */ #include <sys/poll.h> /* For POLL* constants */