[svn-commits] kpfleming: branch 1.4 r182882 - in /branches/1.4: channels/ include/asterisk/...

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Wed Mar 18 06:31:41 2009
New Revision: 182882

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=182882
Log:
fix another symbol namespace issue (reported by Andrew on asterisk-dev)


Modified:
    branches/1.4/channels/chan_dahdi.c
    branches/1.4/include/asterisk/callerid.h
    branches/1.4/main/callerid.c

Modified: branches/1.4/channels/chan_dahdi.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/channels/chan_dahdi.c?view=diff&rev=182882&r1=182881&r2=182882
==============================================================================
--- branches/1.4/channels/chan_dahdi.c (original)
+++ branches/1.4/channels/chan_dahdi.c Wed Mar 18 06:31:41 2009
@@ -7341,7 +7341,7 @@
 									/* 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;

Modified: branches/1.4/include/asterisk/callerid.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/include/asterisk/callerid.h?view=diff&rev=182882&r1=182881&r2=182882
==============================================================================
--- branches/1.4/include/asterisk/callerid.h (original)
+++ branches/1.4/include/asterisk/callerid.h Wed Mar 18 06:31:41 2009
@@ -158,7 +158,7 @@
 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

Modified: branches/1.4/main/callerid.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/main/callerid.c?view=diff&rev=182882&r1=182881&r2=182882
==============================================================================
--- branches/1.4/main/callerid.c (original)
+++ branches/1.4/main/callerid.c Wed Mar 18 06:31:41 2009
@@ -781,7 +781,7 @@
 	
 }
 
-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;