also allows for it to compile once more patch
taken from 6446 with minor mods, similar bugs 6521
and 6560


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