From: Steve Murphy Date: Tue, 10 Feb 2009 02:27:40 +0000 (+0000) Subject: This patch solves some compiler complaints X-Git-Tag: 1.4.24-rc1~74 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=680cc35607df4c038814ff27ac735f837a501d3a;p=thirdparty%2Fasterisk.git This patch solves some compiler complaints in both 32 and 64-bit environments. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@174369 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_rpt.c b/apps/app_rpt.c index b7dc13fdc9..dd4cd3a7d0 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -260,6 +260,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include +#include #include #include #include @@ -471,7 +472,7 @@ struct rpt_tele int mode; struct rpt_link mylink; char param[TELEPARAMSIZE]; - int submode; + intptr_t submode; pthread_t threadid; } ; @@ -4144,7 +4145,7 @@ pthread_attr_t attr; strncpy(tele->param, (char *) data, TELEPARAMSIZE - 1); tele->param[TELEPARAMSIZE - 1] = 0; } - if (mode == REMXXX) tele->submode = (int) data; + if (mode == REMXXX) tele->submode = (intptr_t) data; insque((struct qelem *)tele, (struct qelem *)myrpt->tele.next); rpt_mutex_unlock(&myrpt->lock); pthread_attr_init(&attr); @@ -5098,13 +5099,14 @@ int i; static int function_cop(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink) { char string[16]; + int res; if(!param) return DC_ERROR; switch(myatoi(param)){ case 1: /* System reset */ - system("killall -9 asterisk"); + res = system("killall -9 asterisk"); return DC_COMPLETE; case 2: @@ -7748,7 +7750,8 @@ static int retreive_memory(struct rpt *myrpt, char *memory) static int function_remote(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink) { char *s,*s1,*s2; - int i,j,p,r,ht,k,l,ls2,m,d,offset,offsave, modesave, defmode; + int i,j,r,ht,k,l,ls2,m,d,offset,offsave, modesave, defmode=0; + intptr_t p; char multimode = 0; char oc,*cp,*cp1,*cp2; char tmp[20], freq[20] = "", savestr[20] = "";