diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-29 17:29:59 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-29 17:29:59 +0000 |
| commit | 8417f20fe68be3b186eedbaffd3e5462f5153111 (patch) | |
| tree | 797602764292bb013738ea847efe6813375f71a7 /formats/format_g726.c | |
| parent | 0005174a58a7f131509d96f431eadedf64624326 (diff) | |
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/branches/1.4@90155 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 41cd87a08..499d545d2 100644 --- a/formats/format_g726.c +++ b/formats/format_g726.c @@ -76,7 +76,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; if (option_debug) ast_log(LOG_DEBUG, "Created filestream G.726-%dk.\n", @@ -131,7 +131,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; @@ -151,7 +151,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"); |