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 /formats/format_wav_gsm.c | |
| 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 '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 627e84130..cf40560de 100644 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -370,7 +370,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; @@ -401,7 +401,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; @@ -435,7 +435,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"); @@ -481,7 +481,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); |