[Asterisk-cvs] asterisk/include/asterisk channel.h, 1.55.2.3, 1.55.2.4 io.h, 1.5.4.1, 1.5.4.2

[russell]

Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv24084/include/asterisk

Modified Files:
      Tag: v1-0
	channel.h io.h 
Log Message:
correctly fix build issues on Mac OSX Tiger by using a more generic means
for determining wheter poll and dlfcn functionality needs to be provided


Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.55.2.3
retrieving revision 1.55.2.4
diff -u -d -r1.55.2.3 -r1.55.2.4
--- channel.h	13 Jul 2005 18:06:48 -0000	1.55.2.3
+++ channel.h	1 Oct 2005 01:58:20 -0000	1.55.2.4
@@ -19,7 +19,7 @@
 #include <asterisk/chanvars.h>
 #include <unistd.h>
 #include <setjmp.h>
-#if !defined(OSX10_4) && defined(__APPLE__)
+#ifdef POLLCOMPAT
 #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.4.1
retrieving revision 1.5.4.2
diff -u -d -r1.5.4.1 -r1.5.4.2
--- io.h	13 Jul 2005 18:06:48 -0000	1.5.4.1
+++ io.h	1 Oct 2005 01:58:20 -0000	1.5.4.2
@@ -14,7 +14,7 @@
 #ifndef _IO_H
 #define _IO_H
 
-#if !defined(OSX10_4) && defined(__APPLE__)
+#ifdef POLLCOMPAT
 #include <asterisk/poll-compat.h>
 #else
 #include <sys/poll.h>		/* For POLL* constants */