[asterisk-commits] dlee: trunk r398928 - in /trunk: ./ res/res_pjsip.c

[SVN commits to the Asterisk project]

Author: dlee
Date: Thu Sep 12 10:23:54 2013
New Revision: 398928

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=398928
Log:
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

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Thu Sep 12 10:23:54 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-398754,398759,398806,398821,398837,398882,398886
+/branches/12:1-398558,398560-398577,398579-398927

Modified: trunk/res/res_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip.c?view=diff&rev=398928&r1=398927&r2=398928
==============================================================================
--- trunk/res/res_pjsip.c (original)
+++ trunk/res/res_pjsip.c Thu Sep 12 10:23:54 2013
@@ -1387,8 +1387,8 @@
 }
 
 /* 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 @@
 	{ "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)