From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 13 Sep 2010 23:51:32 +0000 (+0000)
Subject: Merged revisions 286558 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2336
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6adb398e9a6068afedb2b6881977e981baba0a2;p=thirdparty%2Fasterisk.git

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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@286559 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/features.c b/main/features.c
index 3782e32109..68d843bc2e 100644
--- a/main/features.c
+++ b/main/features.c
@@ -3785,9 +3785,9 @@ std:			for (x = 0; x < AST_MAX_FDS; x++) {	/* mark fds for next round */
 							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)++;
 					}
 				}