mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 20:04:50 +00:00
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
This commit is contained in:
@@ -282,7 +282,7 @@ static struct ast_filestream *get_filestream(struct ast_format *fmt, FILE *bfile
|
||||
s->f = bfile;
|
||||
|
||||
if (fmt->desc_size)
|
||||
s->private = ((char *)(s+1)) + fmt->buf_size;
|
||||
s->_private = ((char *)(s+1)) + fmt->buf_size;
|
||||
if (fmt->buf_size)
|
||||
s->buf = (char *)(s+1);
|
||||
s->fr.src = fmt->name;
|
||||
|
Reference in New Issue
Block a user