From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 18 Mar 2009 11:31:41 +0000 (+0000)
Subject: fix another symbol namespace issue (reported by Andrew on asterisk-dev)
X-Git-Tag: 1.4.25-rc1~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5363929193a9932422a84d0a869cda3fb3309a7;p=thirdparty%2Fasterisk.git

fix another symbol namespace issue (reported by Andrew on asterisk-dev)



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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index a8d2bd0567..1ad8d1035d 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -7341,7 +7341,7 @@ static void *do_monitor(void *data)
 									/* Turn on on hook transfer for 4 seconds */
 									x = 4000;
 									ioctl(last->subs[SUB_REAL].dfd, DAHDI_ONHOOKTRANSFER, &x);
-									last->cidlen = vmwi_generate(last->cidspill, res, 1, AST_LAW(last));
+									last->cidlen = ast_callerid_vmwi_generate(last->cidspill, res, 1, AST_LAW(last));
 									last->cidpos = 0;
 									last->msgstate = res;
 									last->onhooktime = thispass;
diff --git a/include/asterisk/callerid.h b/include/asterisk/callerid.h
index 7347dd9d03..f9a8687eb2 100644
--- a/include/asterisk/callerid.h
+++ b/include/asterisk/callerid.h
@@ -158,7 +158,7 @@ void callerid_free(struct callerid_state *cid);
 int ast_callerid_generate(unsigned char *buf, const char *name, const char *number, int codec);
 
 /*! \brief Generate message waiting indicator  (stutter tone) */
-int vmwi_generate(unsigned char *buf, int active, int mdmf, int codec);
+int ast_callerid_vmwi_generate(unsigned char *buf, int active, int mdmf, int codec);
 
 /*! \brief Generate Caller-ID spill but in a format suitable for Call Waiting(tm)'s Caller*ID(tm)
  * See ast_callerid_generate() for other details
diff --git a/main/callerid.c b/main/callerid.c
index bf4bca4299..cd6cde116c 100644
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -781,7 +781,7 @@ static int callerid_genmsg(char *msg, int size, const char *number, const char *
 	
 }
 
-int vmwi_generate(unsigned char *buf, int active, int mdmf, int codec)
+int ast_callerid_vmwi_generate(unsigned char *buf, int active, int mdmf, int codec)
 {
 	unsigned char msg[256];
 	int len=0;