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_ogg_vorbis.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_ogg_vorbis.c')
| -rw-r--r-- | formats/format_ogg_vorbis.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c index 9d80b63d4..ff796e79f 100644 --- a/formats/format_ogg_vorbis.c +++ b/formats/format_ogg_vorbis.c @@ -99,7 +99,7 @@ static int ogg_vorbis_open(struct ast_filestream *s) int result; char **ptr; char *buffer; - struct vorbis_desc *tmp = (struct vorbis_desc *)s->private; + struct vorbis_desc *tmp = (struct vorbis_desc *)s->_private; tmp->writing = 0; @@ -209,7 +209,7 @@ static int ogg_vorbis_rewrite(struct ast_filestream *s, ogg_packet header; ogg_packet header_comm; ogg_packet header_code; - struct vorbis_desc *tmp = (struct vorbis_desc *)s->private; + struct vorbis_desc *tmp = (struct vorbis_desc *)s->_private; tmp->writing = 1; @@ -286,7 +286,7 @@ static int ogg_vorbis_write(struct ast_filestream *fs, struct ast_frame *f) int i; float **buffer; short *data; - struct vorbis_desc *s = (struct vorbis_desc *)fs->private; + struct vorbis_desc *s = (struct vorbis_desc *)fs->_private; if (!s->writing) { ast_log(LOG_ERROR, "This stream is not set up for writing!\n"); @@ -325,7 +325,7 @@ static int ogg_vorbis_write(struct ast_filestream *fs, struct ast_frame *f) */ static void ogg_vorbis_close(struct ast_filestream *fs) { - struct vorbis_desc *s = (struct vorbis_desc *)fs->private; + struct vorbis_desc *s = (struct vorbis_desc *)fs->_private; if (s->writing) { /* Tell the Vorbis encoder that the stream is finished @@ -357,7 +357,7 @@ static int read_samples(struct ast_filestream *fs, float ***pcm) int result; char *buffer; int bytes; - struct vorbis_desc *s = (struct vorbis_desc *)fs->private; + struct vorbis_desc *s = (struct vorbis_desc *)fs->_private; while (1) { samples_in = vorbis_synthesis_pcmout(&s->vd, pcm); @@ -440,7 +440,7 @@ static struct ast_frame *ogg_vorbis_read(struct ast_filestream *fs, int val; int samples_in; int samples_out = 0; - struct vorbis_desc *s = (struct vorbis_desc *)fs->private; + struct vorbis_desc *s = (struct vorbis_desc *)fs->_private; short *buf; /* SLIN data buffer */ fs->fr.frametype = AST_FRAME_VOICE; |