Merged revisions 229498 via svnmerge from
authorDavid Brooks <dbrooks@digium.com>
Wed, 11 Nov 2009 19:48:18 +0000 (19:48 +0000)
committerDavid Brooks <dbrooks@digium.com>
Wed, 11 Nov 2009 19:48:18 +0000 (19:48 +0000)
commitbac499e521133d4c43b381b75477a3a1bf900803
treea2fa1621ea21346d4a212ebb97688cf3bd40104f
parentc5990d41bbe95cade20e2b6a190fa1e18363f82c
Merged revisions 229498 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r229498 | dbrooks | 2009-11-11 13:46:19 -0600 (Wed, 11 Nov 2009) | 8 lines

  Solaris doesn't like NULL going to ast_log

  Solaris will crash if NULL is passed to ast_log. This simple patch simply uses S_OR to
  get around this.

  (closes issue #15392)
  Reported by: yrashk
........

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