diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-11-29 17:50:44 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-11-29 17:50:44 +0000 |
| commit | afac5cce501cfc6b46792cea06e20cbe07271fc7 (patch) | |
| tree | 618831e523571a05ffb2ca1af5dcf337a7cf04b8 /main | |
| parent | 4807fe0f0d68a99313c59f33dd4234c1b6b48ebf (diff) | |
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
Diffstat (limited to 'main')
| -rw-r--r-- | main/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/file.c b/main/file.c index bbdda4c38..fe51c2df7 100644 --- a/main/file.c +++ b/main/file.c @@ -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; |