From 6ad74509f3b54384430b06c1755ccadfbda22246 Mon Sep 17 00:00:00 2001 From: "David M. Lee" Date: Thu, 12 Sep 2013 15:23:54 +0000 Subject: Fix symbol collision with pjsua. We shouldn't be exporting any symbols that start with pjsip_. ........ Merged revisions 398927 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@398928 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_pjsip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/res/res_pjsip.c b/res/res_pjsip.c index d9d841472..2af6a331b 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -1387,8 +1387,8 @@ pjsip_dialog *ast_sip_create_dialog(const struct ast_sip_endpoint *endpoint, con } /* PJSIP doesn't know about the INFO method, so we have to define it ourselves */ -const pjsip_method pjsip_info_method = {PJSIP_OTHER_METHOD, {"INFO", 4} }; -const pjsip_method pjsip_message_method = {PJSIP_OTHER_METHOD, {"MESSAGE", 7} }; +static const pjsip_method info_method = {PJSIP_OTHER_METHOD, {"INFO", 4} }; +static const pjsip_method message_method = {PJSIP_OTHER_METHOD, {"MESSAGE", 7} }; static struct { const char *method; @@ -1403,8 +1403,8 @@ static struct { { "SUBSCRIBE", &pjsip_subscribe_method }, { "NOTIFY", &pjsip_notify_method }, { "PUBLISH", &pjsip_publish_method }, - { "INFO", &pjsip_info_method }, - { "MESSAGE", &pjsip_message_method }, + { "INFO", &info_method }, + { "MESSAGE", &message_method }, }; static const pjsip_method *get_pjsip_method(const char *method) -- cgit v1.2.3