kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-27 16:54:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use of "private" as a field name in a header file messes with C++ projects

Browse Source 
Reported by: chewbacca
Patch by: casper
(Closes issue #11401)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@90155 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-11-29 17:29:59 +00:00
parent e356cd95f3
commit 2c11f7d18e
9 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
formats/format_g726.c
View File

@@ -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");