diff options
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_zap.c | 4 | ||||
| -rwxr-xr-x | channels/iax2-parser.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 2df1590f9..b77776d75 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -1055,7 +1055,7 @@ static int str2r2prot(char *swtype) } #endif -static char *sig2str(int sig) +static char *zap_sig2str(int sig) { static char buf[256]; switch(sig) { @@ -1111,6 +1111,8 @@ static char *sig2str(int sig) } } +#define sig2str zap_sig2str + static int conf_add(struct zt_pvt *p, struct zt_subchannel *c, int index, int slavechannel) { /* If the conference already exists, and we're already in it diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c index edc15ec07..66a69b447 100755 --- a/channels/iax2-parser.c +++ b/channels/iax2-parser.c @@ -30,7 +30,7 @@ static int frames = 0; static int iframes = 0; static int oframes = 0; -#ifdef SOLARIS +#if defined(SOLARIS) && defined(__sparc__) static unsigned int get_uint32(unsigned char *p) { return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; |