From: Mark Spencer <markster@digium.com>
Date: Sat, 7 Jan 2006 20:38:40 +0000 (+0000)
Subject: Fix build if RINGBEGIN is not defined (bug #6166)
X-Git-Tag: 1.4.0-beta1~3040
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b57ae8b6c61c9e43297deba27731ab41fb01ecf;p=thirdparty%2Fasterisk.git

Fix build if RINGBEGIN is not defined (bug #6166)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7860 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 244ea33ccd..33edf6f6a1 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")) {