aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2006-01-07 20:38:40 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2006-01-07 20:38:40 +0000
commita2a72bc5953ece7786b2795336f5b67683fa4bf9 (patch)
tree1a8c9c6c279b6404dc22bb137f27dbed4d195c8a /channels
parent4b0b717d249e082a758b9df0268f56122c4d3f57 (diff)
Fix build if RINGBEGIN is not defined (bug #6166)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7860 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_zap.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 244ea33cc..33edf6f6a 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -5973,10 +5973,12 @@ lax);
ast_log(LOG_NOTICE, "Got event %d (%s)...\n", res, event2str(res));
if (p->cid_signalling == CID_SIG_V23_JP) {
+#ifdef ZT_EVENT_RINGBEGIN
if (res == ZT_EVENT_RINGBEGIN) {
res = zt_set_hook(p->subs[SUB_REAL].zfd, ZT_OFFHOOK);
- usleep(1);
+ usleep(1);
}
+#endif
} else {
res = 0;
break;
@@ -6019,7 +6021,7 @@ lax);
if (p->cid_signalling == CID_SIG_V23_JP) {
res = zt_set_hook(p->subs[SUB_REAL].zfd, ZT_ONHOOK);
- usleep(1);
+ usleep(1);
res = 4000;
} else {
@@ -10438,7 +10440,11 @@ static int setup_zap(int reload)
else if (!strcasecmp(v->value, "dtmf"))
cid_signalling = CID_SIG_DTMF;
else if (!strcasecmp(v->value, "v23_jp"))
+#ifdef ZT_EVENT_RINGBEGIN
cid_signalling = CID_SIG_V23_JP;
+#else
+ ast_log(LOG_WARNING, "Asterisk compiled aginst Zaptel version too old to support japanese CallerID!\n");
+#endif
else if (ast_true(v->value))
cid_signalling = CID_SIG_BELL;
} else if (!strcasecmp(v->name, "cidstart")) {