diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-10 02:45:56 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-10 02:45:56 +0000 |
| commit | 00d7a6f1ded78f17852ff403a5e0d73d159a2b2b (patch) | |
| tree | 321c67c62e0982d697604fa4203202b9a8552b25 /apps/app_rpt.c | |
| parent | 8fc4fe704323e410d25401592258058147e4af10 (diff) | |
Merged revisions 174369 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r174369 | murf | 2009-02-09 19:27:40 -0700 (Mon, 09 Feb 2009) | 5 lines
This patch solves some compiler complaints
in both 32 and 64-bit environments.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@174370 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_rpt.c')
| -rw-r--r-- | apps/app_rpt.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 2fa0cd0d4..cc4566fdc 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -318,6 +318,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <signal.h> #include <stdio.h> +#include <stdint.h> #include <unistd.h> #include <string.h> #include <stdlib.h> @@ -599,7 +600,7 @@ struct rpt_tele int mode; struct rpt_link mylink; char param[TELEPARAMSIZE]; - int submode; + intptr_t submode; unsigned int parrot; pthread_t threadid; } ; @@ -5268,7 +5269,7 @@ char *v1, *v2; 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); @@ -6375,6 +6376,7 @@ static int function_playback(struct rpt *myrpt, char *param, char *digitbuf, int static int function_cop(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink) { char string[16]; + int res; int i, r; @@ -6383,7 +6385,7 @@ static int function_cop(struct rpt *myrpt, char *param, char *digitbuf, int comm switch(myatoi(param)){ case 1: /* System reset */ - system("killall -9 asterisk"); + res = system("killall -9 asterisk"); return DC_COMPLETE; case 2: @@ -9636,7 +9638,8 @@ static int channel_revert(struct rpt *myrpt) 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] = ""; |