Silence warnings with gcc in GetOptionTid_AVC_NOPREFIX
Merge pull request #1381 from mstorsjo/silence-warnings

Silence warnings with gcc in GetOptionTid_AVC_NOPREFIX
Merge remote-tracking branch 'upstream/master' into travis.osx