[asterisk-commits] tilghman: trunk r286559 - in /trunk: ./ main/features.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Sep 13 18:51:32 2010
New Revision: 286559

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=286559
Log:
Merged revisions 286558 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r286558 | tilghman | 2010-09-13 18:50:34 -0500 (Mon, 13 Sep 2010) | 9 lines
  
  Merged revisions 286557 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r286557 | tilghman | 2010-09-13 18:48:51 -0500 (Mon, 13 Sep 2010) | 2 lines
    
    C precedence got me
  ........
................

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

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

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=286559&r1=286558&r2=286559
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Mon Sep 13 18:51:32 2010
@@ -3785,9 +3785,9 @@
 							continue;
 						}
 						*new_pfds = tmp;
-						new_pfds[*new_nfds]->fd = chan->fds[x];
-						new_pfds[*new_nfds]->events = POLLIN | POLLERR;
-						new_pfds[*new_nfds]->revents = 0;
+						(*new_pfds)[*new_nfds].fd = chan->fds[x];
+						(*new_pfds)[*new_nfds].events = POLLIN | POLLERR;
+						(*new_pfds)[*new_nfds].revents = 0;
 						(*new_nfds)++;
 					}
 				}