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_wav_gsm.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_wav_gsm.c')
| -rw-r--r-- | formats/format_wav_gsm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index fea08952e..727f9cf22 100644 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -383,7 +383,7 @@ static int wav_open(struct ast_filestream *s) /* We don't have any header to read or anything really, but if we did, it would go here. We also might want to check and be sure it's a valid file. */ - struct wavg_desc *fs = (struct wavg_desc *)s->private; + struct wavg_desc *fs = (struct wavg_desc *)s->_private; if (check_header(s->f)) return -1; @@ -414,7 +414,7 @@ static void wav_close(struct ast_filestream *s) static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext) { /* Send a frame from the file to the appropriate channel */ - struct wavg_desc *fs = (struct wavg_desc *)s->private; + struct wavg_desc *fs = (struct wavg_desc *)s->_private; s->fr.frametype = AST_FRAME_VOICE; s->fr.subclass = AST_FORMAT_GSM; @@ -448,7 +448,7 @@ static int wav_write(struct ast_filestream *s, struct ast_frame *f) { int len; int size; - struct wavg_desc *fs = (struct wavg_desc *)s->private; + struct wavg_desc *fs = (struct wavg_desc *)s->_private; if (f->frametype != AST_FRAME_VOICE) { ast_log(LOG_WARNING, "Asked to write non-voice frame!\n"); @@ -494,7 +494,7 @@ static int wav_write(struct ast_filestream *s, struct ast_frame *f) static int wav_seek(struct ast_filestream *fs, off_t sample_offset, int whence) { off_t offset=0, distance, max; - struct wavg_desc *s = (struct wavg_desc *)fs->private; + struct wavg_desc *s = (struct wavg_desc *)fs->_private; off_t min = MSGSM_DATA_OFFSET; off_t cur = ftello(fs->f); |