diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2009-03-18 11:40:11 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-03-18 11:40:11 +0000 |
commit | 4f390ec0242b7e267d17fec6063b6061cca1324b (patch) | |
tree | 6a906b195b0036da59a9a5996a32f6f1e67a5f2b | |
parent | a5c2ac4fc22ab4be5e4d3248bdfb5872321aff6a (diff) |
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
-rw-r--r-- | channels/chan_dahdi.c | 4 | ||||
-rw-r--r-- | include/asterisk/callerid.h | 2 | ||||
-rw-r--r-- | main/callerid.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 896e0de8a..cbf318983 100644 --- 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 6177546d9..2d06dedc1 100644 --- 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 89b978881..a7836904e 100644 --- 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; |