[svn-commits] kpfleming: trunk r182883 - in /trunk: ./ channels/ include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Wed Mar 18 06:40:11 2009
New Revision: 182883

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=182883
Log:
Merged revisions 182882 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r182882 | kpfleming | 2009-03-18 06:31:41 -0500 (Wed, 18 Mar 2009) | 3 lines
  
  fix another symbol namespace issue (reported by Andrew on asterisk-dev)
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c
    trunk/include/asterisk/callerid.h
    trunk/main/callerid.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_dahdi.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=182883&r1=182882&r2=182883
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Wed Mar 18 06:40:11 2009
@@ -9017,8 +9017,8 @@
 #ifdef HAVE_DAHDI_LINEREVERSE_VMWI
 	if (pvt->mwisend_fsk) {
 #endif
-		pvt->cidlen = vmwi_generate(pvt->cidspill, has_voicemail(pvt), CID_MWI_TYPE_MDMF_FULL,
-								AST_LAW(pvt), pvt->cid_name, pvt->cid_num, 0);
+		pvt->cidlen = ast_callerid_vmwi_generate(pvt->cidspill, has_voicemail(pvt), CID_MWI_TYPE_MDMF_FULL,
+							 AST_LAW(pvt), pvt->cid_name, pvt->cid_num, 0);
 		pvt->cidpos = 0;
 #ifdef HAVE_DAHDI_LINEREVERSE_VMWI
 	}

Modified: trunk/include/asterisk/callerid.h
URL: http://svn.digium.com/svn-view/asterisk/trunk/include/asterisk/callerid.h?view=diff&rev=182883&r1=182882&r2=182883
==============================================================================
--- trunk/include/asterisk/callerid.h (original)
+++ trunk/include/asterisk/callerid.h Wed Mar 18 06:40:11 2009
@@ -176,7 +176,7 @@
  *  \see callerid_generate() for more info as it use the same encoding
  *  \version 1.6.1 changed mdmf parameter to type, added name, number and flags for caller id message generation
 */
-int vmwi_generate(unsigned char *buf, int active, int type, int codec, const char *name,
+int ast_callerid_vmwi_generate(unsigned char *buf, int active, int type, int codec, const char *name,
 	const char *number, int flags);
 
 /*! \brief Generate Caller-ID spill but in a format suitable for Call Waiting(tm)'s Caller*ID(tm)

Modified: trunk/main/callerid.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/callerid.c?view=diff&rev=182883&r1=182882&r2=182883
==============================================================================
--- trunk/main/callerid.c (original)
+++ trunk/main/callerid.c Wed Mar 18 06:40:11 2009
@@ -791,8 +791,8 @@
 	
 }
 
-int vmwi_generate(unsigned char *buf, int active, int type, int codec,
-				  const char* name, const char* number, int flags)
+int ast_callerid_vmwi_generate(unsigned char *buf, int active, int type, int codec,
+			       const char* name, const char* number, int flags)
 {
 	char msg[256];
 	int len = 0;