[svn-commits] rizzo: trunk r89355 - in /trunk: include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: rizzo
Date: Fri Nov 16 21:07:06 2007
New Revision: 89355

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89355
Log:
use poll as detected by configure

Modified:
    trunk/include/asterisk/channel.h
    trunk/include/asterisk/io.h
    trunk/main/Makefile

Modified: trunk/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=89355&r1=89354&r2=89355
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Fri Nov 16 21:07:06 2007
@@ -125,11 +125,10 @@
 
 #include "asterisk/abstract_jb.h"
 
-#include <unistd.h>
-#ifdef POLLCOMPAT 
+#ifdef HAVE_POLL 
+#include <sys/poll.h>
+#else
 #include "asterisk/poll-compat.h"
-#else
-#include <sys/poll.h>
 #endif
 
 #if defined(__cplusplus) || defined(c_plusplus)

Modified: trunk/include/asterisk/io.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/io.h?view=diff&rev=89355&r1=89354&r2=89355
==============================================================================
--- trunk/include/asterisk/io.h (original)
+++ trunk/include/asterisk/io.h Fri Nov 16 21:07:06 2007
@@ -23,10 +23,10 @@
 #ifndef _ASTERISK_IO_H
 #define _ASTERISK_IO_H
 
-#ifdef POLLCOMPAT
+#ifdef HAVE_POLL
+#include <sys/poll.h>		/* For POLL* constants */
+#else
 #include "asterisk/poll-compat.h"
-#else
-#include <sys/poll.h>		/* For POLL* constants */
 #endif
 
 #if defined(__cplusplus) || defined(c_plusplus)

Modified: trunk/main/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/main/Makefile?view=diff&rev=89355&r1=89354&r2=89355
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Fri Nov 16 21:07:06 2007
@@ -41,14 +41,8 @@
 AST_LIBS += $(SSL_LIB)
 AST_LIBS += $(BKTR_LIB)
 
-ifneq ($(findstring darwin,$(OSARCH)),)
+ifeq ($(POLL_AVAILABLE),)
   OBJS+=poll.o
-  ASTCFLAGS+=-DPOLLCOMPAT
-else
-  ifeq ($(wildcard /usr/include/sys/poll.h),)
-    OBJS+=poll.o
-    ASTCFLAGS+=-DPOLLCOMPAT
-  endif
 endif
 
 ifeq ($(wildcard /usr/include/dlfcn.h),)