mirror of
https://github.com/asterisk/asterisk.git
synced 2026-07-28 00:10:25 -07:00
fix another symbol namespace issue (reported by Andrew on asterisk-dev)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@182882 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -7341,7 +7341,7 @@ static void *do_monitor(void *data)
|
||||
/* Turn on on hook transfer for 4 seconds */
|
||||
x = 4000;
|
||||
ioctl(last->subs[SUB_REAL].dfd, DAHDI_ONHOOKTRANSFER, &x);
|
||||
last->cidlen = vmwi_generate(last->cidspill, res, 1, AST_LAW(last));
|
||||
last->cidlen = ast_callerid_vmwi_generate(last->cidspill, res, 1, AST_LAW(last));
|
||||
last->cidpos = 0;
|
||||
last->msgstate = res;
|
||||
last->onhooktime = thispass;
|
||||
|
||||
@@ -158,7 +158,7 @@ void callerid_free(struct callerid_state *cid);
|
||||
int ast_callerid_generate(unsigned char *buf, const char *name, const char *number, int codec);
|
||||
|
||||
/*! \brief Generate message waiting indicator (stutter tone) */
|
||||
int vmwi_generate(unsigned char *buf, int active, int mdmf, int codec);
|
||||
int ast_callerid_vmwi_generate(unsigned char *buf, int active, int mdmf, int codec);
|
||||
|
||||
/*! \brief Generate Caller-ID spill but in a format suitable for Call Waiting(tm)'s Caller*ID(tm)
|
||||
* See ast_callerid_generate() for other details
|
||||
|
||||
+1
-1
@@ -781,7 +781,7 @@ static int callerid_genmsg(char *msg, int size, const char *number, const char *
|
||||
|
||||
}
|
||||
|
||||
int vmwi_generate(unsigned char *buf, int active, int mdmf, int codec)
|
||||
int ast_callerid_vmwi_generate(unsigned char *buf, int active, int mdmf, int codec)
|
||||
{
|
||||
unsigned char msg[256];
|
||||
int len=0;
|
||||
|
||||
Reference in New Issue
Block a user