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_wav.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_wav.c')
| -rw-r--r-- | formats/format_wav.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/formats/format_wav.c b/formats/format_wav.c index 238c11288..2a40dedbd 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -307,7 +307,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 wav_desc *tmp = (struct wav_desc *)s->private; + struct wav_desc *tmp = (struct wav_desc *)s->_private; if ((tmp->maxlen = check_header(s->f)) < 0) return -1; return 0; @@ -327,7 +327,7 @@ static int wav_rewrite(struct ast_filestream *s, const char *comment) static void wav_close(struct ast_filestream *s) { char zero = 0; - struct wav_desc *fs = (struct wav_desc *)s->private; + struct wav_desc *fs = (struct wav_desc *)s->_private; /* Pad to even length */ if (fs->bytes & 0x1) fwrite(&zero, 1, 1, s->f); @@ -344,7 +344,7 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext) int bytes = WAV_BUF_SIZE; /* in bytes */ off_t here; /* Send a frame from the file to the appropriate channel */ - struct wav_desc *fs = (struct wav_desc *)s->private; + struct wav_desc *fs = (struct wav_desc *)s->_private; here = ftello(s->f); if (fs->maxlen - here < bytes) /* truncate if necessary */ @@ -382,7 +382,7 @@ static int wav_write(struct ast_filestream *fs, struct ast_frame *f) int x; short tmp[8000], *tmpi; #endif - struct wav_desc *s = (struct wav_desc *)fs->private; + struct wav_desc *s = (struct wav_desc *)fs->_private; int res; if (f->frametype != AST_FRAME_VOICE) { |