[Freeswitch-svn] [commit] r4755 - in freeswitch/trunk: libs/apr-util/xml/expat/lib src w32/Library

[Freeswitch SVN]

Author: mikej
Date: Fri Mar 23 17:54:16 2007
New Revision: 4755

Modified:
   freeswitch/trunk/libs/apr-util/xml/expat/lib/winconfig.h
   freeswitch/trunk/src/switch_resample.c
   freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj

Log:
fix windows build.  you may need to delete libs/apr-util/xml/expat/lib/config.h for it to build.

Modified: freeswitch/trunk/libs/apr-util/xml/expat/lib/winconfig.h
==============================================================================
--- freeswitch/trunk/libs/apr-util/xml/expat/lib/winconfig.h	(original)
+++ freeswitch/trunk/libs/apr-util/xml/expat/lib/winconfig.h	Fri Mar 23 17:54:16 2007
@@ -23,5 +23,6 @@
 #define XML_DTD 1
 #define XML_BYTE_ORDER 12
 #define XML_CONTEXT_BYTES 1024
+#define HAVE_MEMMOVE
 
 #endif /* ndef WINCONFIG_H */

Modified: freeswitch/trunk/src/switch_resample.c
==============================================================================
--- freeswitch/trunk/src/switch_resample.c	(original)
+++ freeswitch/trunk/src/switch_resample.c	Fri Mar 23 17:54:16 2007
@@ -185,8 +185,9 @@
 
 SWITCH_DECLARE(void) switch_generate_sln_silence(int16_t *data, uint32_t samples, uint32_t divisor)
 {
-	int16_t rnd, x,i;
-	uint32_t sum_rnd = 0;
+	int16_t rnd, x;
+	uint32_t i;
+	int sum_rnd = 0;
 
 	assert(divisor);
 	
@@ -196,8 +197,7 @@
 			sum_rnd += rnd;
 		}
 		switch_normalize_to_16bit(sum_rnd);
-		*data = (int16_t) sum_rnd;
-		*data /= (int)divisor;
+		*data = (int16_t)((int16_t)sum_rnd / (int)divisor);
 
 		data++;
 	}

Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj
==============================================================================
--- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj	(original)
+++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj	Fri Mar 23 17:54:16 2007
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src"
+				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src"
+				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;CRASH_PROT;PCRE_STATIC"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"