diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-29 17:50:44 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-29 17:50:44 +0000 |
| commit | 178cee50cf81adb1843d7c62146abe1bf7e751e9 (patch) | |
| tree | 618831e523571a05ffb2ca1af5dcf337a7cf04b8 /formats/format_g726.c | |
| parent | d59352983154648515c37cd1d3cd30a5fb7ab090 (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: http://svn.digium.com/svn/asterisk/trunk@90158 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats/format_g726.c')
| -rw-r--r-- | formats/format_g726.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/formats/format_g726.c b/formats/format_g726.c index ecde39e76..e27476fed 100644 --- a/formats/format_g726.c +++ b/formats/format_g726.c @@ -62,7 +62,7 @@ struct g726_desc { */ static int g726_open(struct ast_filestream *tmp, int rate) { - struct g726_desc *s = (struct g726_desc *)tmp->private; + struct g726_desc *s = (struct g726_desc *)tmp->_private; s->rate = rate; ast_debug(1, "Created filestream G.726-%dk.\n", 40 - s->rate * 8); return 0; @@ -115,7 +115,7 @@ static int g726_16_rewrite(struct ast_filestream *s, const char *comment) static struct ast_frame *g726_read(struct ast_filestream *s, int *whennext) { int res; - struct g726_desc *fs = (struct g726_desc *)s->private; + struct g726_desc *fs = (struct g726_desc *)s->_private; /* Send a frame from the file to the appropriate channel */ s->fr.frametype = AST_FRAME_VOICE; @@ -135,7 +135,7 @@ static struct ast_frame *g726_read(struct ast_filestream *s, int *whennext) static int g726_write(struct ast_filestream *s, struct ast_frame *f) { int res; - struct g726_desc *fs = (struct g726_desc *)s->private; + struct g726_desc *fs = (struct g726_desc *)s->_private; if (f->frametype != AST_FRAME_VOICE) { ast_log(LOG_WARNING, "Asked to write non-voice frame!\n"); |