mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-11 23:28:59 +00:00
use poll as detected by configure
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89355 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -125,11 +125,10 @@ References:
|
||||
|
||||
#include "asterisk/abstract_jb.h"
|
||||
|
||||
#include <unistd.h>
|
||||
#ifdef POLLCOMPAT
|
||||
#include "asterisk/poll-compat.h"
|
||||
#else
|
||||
#ifdef HAVE_POLL
|
||||
#include <sys/poll.h>
|
||||
#else
|
||||
#include "asterisk/poll-compat.h"
|
||||
#endif
|
||||
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
|
@@ -23,10 +23,10 @@
|
||||
#ifndef _ASTERISK_IO_H
|
||||
#define _ASTERISK_IO_H
|
||||
|
||||
#ifdef POLLCOMPAT
|
||||
#include "asterisk/poll-compat.h"
|
||||
#else
|
||||
#ifdef HAVE_POLL
|
||||
#include <sys/poll.h> /* For POLL* constants */
|
||||
#else
|
||||
#include "asterisk/poll-compat.h"
|
||||
#endif
|
||||
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
|
@@ -41,14 +41,8 @@ OBJS+=say.o
|
||||
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),)
|
||||
|
Reference in New Issue
Block a user