[svn-commits] russell: branch 1.6.2 r184152 - in /branches/1.6.2: ./ main/timing.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Mar 24 21:04:08 2009
New Revision: 184152

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184152
Log:
Merged revisions 184151 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r184151 | russell | 2009-03-24 21:03:13 -0500 (Tue, 24 Mar 2009) | 2 lines
  
  Change poll() to ast_poll().
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/timing.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Tue Mar 24 21:04:08 2009
@@ -1,1 +1,1 @@
-/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028,183057,183108,183117,183242,183244,183321,183511,183560,183701,183766,183865,183914,184037,184043,184079,184147
+/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028,183057,183108,183117,183242,183244,183321,183511,183560,183701,183766,183865,183914,184037,184043,184079,184147,184151

Modified: branches/1.6.2/main/timing.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/main/timing.c?view=diff&rev=184152&r1=184151&r2=184152
==============================================================================
--- branches/1.6.2/main/timing.c (original)
+++ branches/1.6.2/main/timing.c Tue Mar 24 21:04:08 2009
@@ -290,7 +290,7 @@
 			.events = POLLIN | POLLPRI,
 		};
 
-		res = poll(&pfd, 1, 100);
+		res = ast_poll(&pfd, 1, 100);
 
 		if (res == 1) {
 			count++;