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 /include/asterisk/callerid.h | |
| 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
Diffstat (limited to 'include/asterisk/callerid.h')
| -rw-r--r-- | include/asterisk/callerid.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) |