Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv28595/include/asterisk
Modified Files:
Tag: v1-0
channel.h io.h
Log Message:
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
Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.55.2.2
retrieving revision 1.55.2.3
diff -u -d -r1.55.2.2 -r1.55.2.3
--- channel.h 14 Jun 2005 18:41:48 -0000 1.55.2.2
+++ channel.h 13 Jul 2005 18:06:48 -0000 1.55.2.3
@@ -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>
Index: io.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/io.h,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -d -r1.5 -r1.5.4.1
--- io.h 26 Oct 2003 18:50:49 -0000 1.5
+++ io.h 13 Jul 2005 18:06:48 -0000 1.5.4.1
@@ -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 */
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
