kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 07:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

use poll as detected by configure

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89355 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2007-11-17 03:07:06 +00:00
parent 3b1f69deea
commit 5862c55451
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/asterisk/channel.h
View File

@@ -125,11 +125,10 @@ References:
#include "asterisk/abstract_jb.h" #include "asterisk/abstract_jb.h"
#include <unistd.h> #ifdef HAVE_POLL
#ifdef POLLCOMPAT
#include "asterisk/poll-compat.h"
#else
#include <sys/poll.h> #include <sys/poll.h>
#else
#include "asterisk/poll-compat.h"
#endif #endif
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)

6
include/asterisk/io.h
View File

@@ -23,10 +23,10 @@
#ifndef _ASTERISK_IO_H #ifndef _ASTERISK_IO_H
#define _ASTERISK_IO_H #define _ASTERISK_IO_H
#ifdef POLLCOMPAT #ifdef HAVE_POLL
#include "asterisk/poll-compat.h"
#else
#include <sys/poll.h> /* For POLL* constants */ #include <sys/poll.h> /* For POLL* constants */
#else
#include "asterisk/poll-compat.h"
#endif #endif
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)

8
main/Makefile
View File

@@ -41,14 +41,8 @@ OBJS+=say.o
AST_LIBS += $(SSL_LIB) AST_LIBS += $(SSL_LIB)
AST_LIBS += $(BKTR_LIB) AST_LIBS += $(BKTR_LIB)
ifneq ($(findstring darwin,$(OSARCH)),) ifeq ($(POLL_AVAILABLE),)
OBJS+=poll.o OBJS+=poll.o
ASTCFLAGS+=-DPOLLCOMPAT
else
ifeq ($(wildcard /usr/include/sys/poll.h),)
OBJS+=poll.o
ASTCFLAGS+=-DPOLLCOMPAT
endif
endif endif
ifeq ($(wildcard /usr/include/dlfcn.h),) ifeq ($(wildcard /usr/include/dlfcn.h),)