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)
........

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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 896e0de..cbf3189 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -9017,8 +9017,8 @@ static int mwi_send_init(struct dahdi_pvt * pvt)
 #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
        }

diff --git a/include/asterisk/callerid.h b/include/asterisk/callerid.h
index 6177546..2d06ded 100644 (file)
--- a/include/asterisk/callerid.h
+++ b/include/asterisk/callerid.h
@@ -176,7 +176,7 @@ int ast_callerid_generate(unsigned char *buf, const char *name, const char *numb
  *  \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)

diff --git a/main/callerid.c b/main/callerid.c
index 89b9788..a783690 100644 (file)
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -791,8 +791,8 @@ static int callerid_genmsg(char *msg, int size, const char *number, const char *
        
 }
 
-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;