[Freeswitch-svn] [commit] r5844 - in freeswitch/trunk/libs: sofia-sip/libsofia-sip-ua/nta sofia-sip/libsofia-sip-ua/sip sofia-sip/win32 win32/sofia

[Freeswitch SVN]

Author: mikej
Date: Thu Oct 11 17:14:34 2007
New Revision: 5844

Modified:
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c
   freeswitch/trunk/libs/sofia-sip/win32/build_sources.cmd
   freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj

Log:
update msvc build to sync with new sofia-sip.

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h	Thu Oct 11 17:14:34 2007
@@ -146,7 +146,7 @@
   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;

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c	Thu Oct 11 17:14:34 2007
@@ -913,8 +913,6 @@
 			    a->a_url,
 			    a->a_params,
 			    offset);
-
-  return offset;
 }
 
 /**@internal

Modified: freeswitch/trunk/libs/sofia-sip/win32/build_sources.cmd
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/win32/build_sources.cmd	(original)
+++ freeswitch/trunk/libs/sofia-sip/win32/build_sources.cmd	Thu Oct 11 17:14:34 2007
@@ -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

Modified: freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj	(original)
+++ freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj	Thu Oct 11 17:14:34 2007
@@ -193,6 +193,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\smoothsort.c"
+					>
+				</File>
+				<File
 					RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\string0.c"
 					>
 				</File>