Merged revisions 285268 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Tue, 7 Sep 2010 19:09:08 +0000 (19:09 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Tue, 7 Sep 2010 19:09:08 +0000 (19:09 +0000)
commita3a02316f26f2559aeff0db0e834417fae3a90fd
tree0365bae22445c7f0c68dce255e8c662e0f55a12a
parentf5418e227958a2601809ec594cac00abeb5676ce
Merged revisions 285268 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r285268 | tilghman | 2010-09-07 14:08:09 -0500 (Tue, 07 Sep 2010) | 18 lines

  Merged revisions 285267 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r285267 | tilghman | 2010-09-07 14:07:17 -0500 (Tue, 07 Sep 2010) | 11 lines

    Merged revisions 285266 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4

    ........
      r285266 | tilghman | 2010-09-07 14:04:50 -0500 (Tue, 07 Sep 2010) | 4 lines

      Use poll, if indicated to do so, in the ast_poll2 implementation.

      This fixes the unit tests on FreeBSD 8.0.
    ........
  ................
................

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