update ms2 and fix non ansi c

diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index f49c59f12e3f0d948f5ea73a3a078022bdb3d602..674422be94f6eff437c2834759aa0f89033c42bf 100644 (file)
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -249,13 +249,14 @@ static char *guess_contact_for_register(LinphoneProxyConfig *obj){
        if (host!=NULL){
                LinphoneAddress *contact;
                char localip[LINPHONE_IPADDR_SIZE];
+               LCSipTransports tr;
                
                linphone_core_get_local_ip(obj->lc,host,localip);
                contact=linphone_address_new(obj->reg_identity);
                linphone_address_set_domain (contact,localip);
                linphone_address_set_port_int(contact,linphone_core_get_sip_port(obj->lc));
                linphone_address_set_display_name(contact,NULL);
-               LCSipTransports tr;
+               
                linphone_core_get_sip_transports(obj->lc,&tr);
                if (tr.udp_port <= 0 && tr.tcp_port>0) {
                        sal_address_add_param(contact,"transport","tcp");

diff --git a/mediastreamer2 b/mediastreamer2
index 9557b33ab49e4c309bc1f954a2afae25079c757a..874577ad3a835255fc719da26f5dbdadf301aa01 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 9557b33ab49e4c309bc1f954a2afae25079c757a
+Subproject commit 874577ad3a835255fc719da26f5dbdadf301aa01

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0efc5f6cf948d8737592f4cce64eb87f42d2e63a..c099ec55f8519fc71ea0c8eb10432b9f0c21afb5 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,6 +29,7 @@ coreapi/presence.c
 coreapi/friend.c
 coreapi/proxy.c
 coreapi/callbacks.c
+coreapi/sal_eXosip2.c
 mediastreamer2/src/alaw.c
 mediastreamer2/src/alsa.c
 mediastreamer2/src/aqsnd.c