From: Richard Mudgett Date: Wed, 29 Aug 2012 19:57:24 +0000 (+0000) Subject: Fix theoretical compile error with HAVE_EPOLL. X-Git-Tag: 13.0.0-beta1~2602 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a6393d8de72b73ac8080deb3e41588d7d27c817;p=thirdparty%2Fasterisk.git Fix theoretical compile error with HAVE_EPOLL. Really shows how much epoll is used since it had not been reported yet. ........ Merged revisions 371893 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@371894 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/channel.c b/main/channel.c index 32ce57ec5d..872e844d86 100644 --- a/main/channel.c +++ b/main/channel.c @@ -986,7 +986,7 @@ __ast_channel_alloc_ap(int needqueue, int state, const char *cid_num, const char ast_channel_internal_fd_clear_all(tmp); #ifdef HAVE_EPOLL - ast_channel_epfd(tmp) = epoll_create(25); + ast_channel_epfd_set(tmp, epoll_create(25)); #endif if (!(schedctx = ast_sched_context_create())) { @@ -1217,7 +1217,7 @@ struct ast_channel *ast_dummy_channel_alloc(void) ast_channel_internal_alertpipe_clear(tmp); ast_channel_internal_fd_clear_all(tmp); #ifdef HAVE_EPOLL - ast_channel_epfd(tmp) = -1; + ast_channel_epfd_set(tmp, -1); #endif headp = ast_channel_varshead(tmp);