Merged revisions 90155 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Thu, 29 Nov 2007 17:50:44 +0000 (17:50 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Thu, 29 Nov 2007 17:50:44 +0000 (17:50 +0000)
commitafac5cce501cfc6b46792cea06e20cbe07271fc7
tree618831e523571a05ffb2ca1af5dcf337a7cf04b8
parent4807fe0f0d68a99313c59f33dd4234c1b6b48ebf
Merged revisions 90155 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r90155 | tilghman | 2007-11-29 11:29:59 -0600 (Thu, 29 Nov 2007) | 5 lines

Use of "private" as a field name in a header file messes with C++ projects
Reported by: chewbacca
Patch by: casper
(Closes issue #11401)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
formats/format_g726.c
formats/format_h263.c
formats/format_h264.c
formats/format_ogg_vorbis.c
formats/format_pcm.c
formats/format_wav.c
formats/format_wav_gsm.c
include/asterisk/mod_format.h
main/file.c