aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_zap.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-03-17 23:12:15 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-03-17 23:12:15 +0000
commit57710533e753388fd7a1721f66a4d847c8b6e44b (patch)
tree3fa0c3a5fb61e3662f4353566a235dca4291f79a /channels/chan_zap.c
parent3c174d1548595cc0b59a08b7b10dad9f8145471b (diff)
Add support for Solaris/x86 (bug #3064)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5199 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
-rwxr-xr-xchannels/chan_zap.c4
1 files changed, 3 insertions, 1 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