diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-18 11:31:41 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-18 11:31:41 +0000 |
| commit | 69cb56ad35352e4f26050cbcd5fc459b1abd5791 (patch) | |
| tree | 32605c16f3bb595ab746d5e71ec6b79020d47961 | |
| parent | 91586477bbe6336c9debddf804edb8d02db71ab6 (diff) | |
fix another symbol namespace issue (reported by Andrew on asterisk-dev)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@182882 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_dahdi.c | 2 | ||||
| -rw-r--r-- | include/asterisk/callerid.h | 2 | ||||
| -rw-r--r-- | main/callerid.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index a8d2bd056..1ad8d1035 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -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; diff --git a/include/asterisk/callerid.h b/include/asterisk/callerid.h index 7347dd9d0..f9a8687eb 100644 --- a/include/asterisk/callerid.h +++ b/include/asterisk/callerid.h @@ -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 diff --git a/main/callerid.c b/main/callerid.c index bf4bca429..cd6cde116 100644 --- a/main/callerid.c +++ b/main/callerid.c @@ -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; |