From 7a4ed161c27aa0844b7615bbd0fadbcb04126e65 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 11 Oct 2007 21:14:34 +0000 Subject: [PATCH] update msvc build to sync with new sofia-sip. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5844 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h | 2 +- libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c | 2 -- libs/sofia-sip/win32/build_sources.cmd | 6 +++--- libs/win32/sofia/libsofia_sip_ua_static.vcproj | 4 ++++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h b/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h index 5cce3c73c0..69b8c46a56 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h +++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h @@ -146,7 +146,7 @@ struct nta_agent_s size_t sa_maxsize; /** Maximum size of outgoing UDP requests */ - size_t sa_udp_mtu; + unsigned sa_udp_mtu; /** SIP T1 - initial interval of retransmissions (500 ms) */ unsigned sa_t1; diff --git a/libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c b/libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c index 974b125a42..c13ec0467a 100644 --- a/libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c +++ b/libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c @@ -913,8 +913,6 @@ isize_t sip_addr_dup_xtra(sip_header_t const *h, isize_t offset) a->a_url, a->a_params, offset); - - return offset; } /**@internal diff --git a/libs/sofia-sip/win32/build_sources.cmd b/libs/sofia-sip/win32/build_sources.cmd index 2e62dbedf3..b259477bbc 100644 --- a/libs/sofia-sip/win32/build_sources.cmd +++ b/libs/sofia-sip/win32/build_sources.cmd @@ -61,12 +61,12 @@ %CHECK% %MSG_AWK% module=sip PR=%PR4% %IN% < NUL %CHECK% -%MSG_AWK% module=sip PR=%PR5% TEMPLATE1=%PR2%.in TEMPLATE2=%PR3%.in TEMPLATE=%PR5%.in NO_FIRST=1 NO_LAST=1 < NUL %SIPEXTRA% +%MSG_AWK% module=sip PR=%PR5% TEMPLATE1=%PR2%.in TEMPLATE2=%PR3%.in TEMPLATE3=%PR4%.in TEMPLATE=%PR5%.in NO_FIRST=1 NO_LAST=1 < NUL %SIPEXTRA% %CHECK% -%MSG_AWK% module=sip MC_HASH_SIZE=127 MC_SHORT_SIZE=26 ^ +%MSG_AWK% module=sip TEMPLATE=%PT%.in MC_HASH_SIZE=127 MC_SHORT_SIZE=26 ^ FLAGFILE=../libsofia-sip-ua/sip/sip_bad_mask ^ - PT=%PT% %IN% < NUL + PT=%PT% %IN% %SIPEXTRA% < NUL %CHECK% @set IN=../libsofia-sip-ua/http/sofia-sip/http.h diff --git a/libs/win32/sofia/libsofia_sip_ua_static.vcproj b/libs/win32/sofia/libsofia_sip_ua_static.vcproj index b6716f17ae..9e0928cbd5 100644 --- a/libs/win32/sofia/libsofia_sip_ua_static.vcproj +++ b/libs/win32/sofia/libsofia_sip_ua_static.vcproj @@ -192,6 +192,10 @@ RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\inet_pton.c" > + +