From d636f3a9db344b8cedd4fec017d9de494f710b8b Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Tue, 10 Feb 2009 04:46:17 +0000 Subject: [PATCH] Merged revisions 174432 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r174432 | murf | 2009-02-09 21:36:22 -0700 (Mon, 09 Feb 2009) | 3 lines More intptr_t work. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174434 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_rpt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 4ea9d76c03..3cffe1e590 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -601,7 +601,7 @@ struct rpt_tele struct rpt_link mylink; char param[TELEPARAMSIZE]; intptr_t submode; - unsigned int parrot; + uintptr_t parrot; pthread_t threadid; } ; @@ -4972,7 +4972,7 @@ struct dahdi_params par; case PARROT: /* Repeat stuff */ - sprintf(mystr,PARROTFILE,myrpt->name,mytele->parrot); + sprintf(mystr,PARROTFILE,myrpt->name,(unsigned int)mytele->parrot); if (ast_fileexists(mystr,NULL,mychannel->language) <= 0) { imdone = 1; @@ -4980,14 +4980,14 @@ struct dahdi_params par; break; } wait_interval(myrpt, DLY_PARROT, mychannel); - sprintf(mystr,PARROTFILE,myrpt->name,mytele->parrot); + sprintf(mystr,PARROTFILE,myrpt->name,(unsigned int)mytele->parrot); res = ast_streamfile(mychannel, mystr, mychannel->language); if (!res) res = ast_waitstream(mychannel, ""); else ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name); ast_stopstream(mychannel); - sprintf(mystr,PARROTFILE,myrpt->name,mytele->parrot); + sprintf(mystr,PARROTFILE,myrpt->name,(unsigned int)mytele->parrot); strcat(mystr,".wav"); unlink(mystr); imdone = 1; @@ -5255,7 +5255,7 @@ char *v1, *v2; memset((char *)tele,0,sizeof(struct rpt_tele)); tele->rpt = myrpt; tele->mode = mode; - if (mode == PARROT) tele->parrot = (unsigned int) data; + if (mode == PARROT) tele->parrot = (uintptr_t) data; else mylink = (struct rpt_link *) data; rpt_mutex_lock(&myrpt->lock); if((mode == CONNFAIL) || (mode == REMDISC) || (mode == CONNECTED) || @@ -11991,7 +11991,7 @@ char tmpstr[300],lstr[MAXLINKLIST]; ast_closestream(myrpt->parrotstream); myrpt->parrotstream = NULL; myrpt->parrotstate = 2; - rpt_telemetry(myrpt,PARROT,(struct rpt_link *) myrpt->parrotcnt++); + rpt_telemetry(myrpt,PARROT,(void *) ((intptr_t)myrpt->parrotcnt++)); } if (myrpt->cmdAction.state == CMD_STATE_READY) { /* there is a command waiting to be processed */