[Asterisk-cvs] asterisk/include/asterisk channel.h, 1.101, 1.102 io.h, 1.8, 1.9

[kpfleming]

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

Modified Files:
	channel.h io.h 
Log Message:
use a more generic means to decide whether we need to provide poll/dlfcn functionality (issue #5297)


Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- channel.h	15 Sep 2005 16:34:39 -0000	1.101
+++ channel.h	26 Sep 2005 17:17:56 -0000	1.102
@@ -31,7 +31,7 @@
 
 #include <unistd.h>
 #include <setjmp.h>
-#if 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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- io.h	30 Aug 2005 18:32:09 -0000	1.8
+++ io.h	26 Sep 2005 17:17:56 -0000	1.9
@@ -23,7 +23,7 @@
 #ifndef _ASTERISK_IO_H
 #define _ASTERISK_IO_H
 
-#ifdef __APPLE__
+#ifdef POLLCOMPAT
 #include "asterisk/poll-compat.h"
 #else
 #include <sys/poll.h>		/* For POLL* constants */