提交 67acaefc authored 作者: Michael Jerris's avatar Michael Jerris

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

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4755 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 bf0c0231
......@@ -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 */
......@@ -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++;
}
......
......@@ -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"
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论