[svn-commits] rmudgett: trunk r371894 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Aug 29 14:57:24 2012
New Revision: 371894

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=371894
Log:
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

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=371894&r1=371893&r2=371894
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Wed Aug 29 14:57:24 2012
@@ -986,7 +986,7 @@
 	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 @@
 	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);