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

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4755 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/apr-util/xml/expat/lib/winconfig.h b/libs/apr-util/xml/expat/lib/winconfig.h
index 77b1ece8ca1e3cc7ad352c3223603872eb6e9e08..602ea94111821d65a9fd269e30bca43892338120 100644 (file)
--- a/libs/apr-util/xml/expat/lib/winconfig.h
+++ b/libs/apr-util/xml/expat/lib/winconfig.h
@@ -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 */

diff --git a/src/switch_resample.c b/src/switch_resample.c
index af6321fa9fd2f87828bf158b98fbb125984a4d11..20c6729d607505909ba60f648d82c3b482c85e68 100644 (file)
--- a/src/switch_resample.c
+++ b/src/switch_resample.c
@@ -185,8 +185,9 @@ SWITCH_DECLARE(void) switch_swap_linear(int16_t *buf, int len)
 
 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 @@ SWITCH_DECLARE(void) switch_generate_sln_silence(int16_t *data, uint32_t samples
                        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++;
        }

diff --git a/w32/Library/FreeSwitchCore.vcproj b/w32/Library/FreeSwitchCore.vcproj
index e25e5243d7b12e04528d32a32509df374328afc3..6c1ebff6002e653d033d2972991ceb2190d150d8 100644 (file)
--- a/w32/Library/FreeSwitchCore.vcproj
+++ b/w32/Library/FreeSwitchCore.vcproj
@@ -43,7 +43,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -136,7 +136,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;CRASH_PROT;PCRE_STATIC"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="2"\r