summaryrefslogtreecommitdiff
path: root/main/callerid.c
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2009-03-18 11:40:11 +0000
committerKevin P. Fleming <kpfleming@digium.com>2009-03-18 11:40:11 +0000
commit4f390ec0242b7e267d17fec6063b6061cca1324b (patch)
tree6a906b195b0036da59a9a5996a32f6f1e67a5f2b /main/callerid.c
parenta5c2ac4fc22ab4be5e4d3248bdfb5872321aff6a (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 'main/callerid.c')
-rw-r--r--main/callerid.c4
1 files changed, 2 insertions, 2 deletions
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;