Skip to content

F
freeswitch
提交 1a87e3b3 authored 作者: Michael Jerris's avatar Michael Jerris
浏览文件
操作

cleanup msvc build and fix msvc build warnings 

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@689 a93c3328-9c30-0410-af19-c9cd2b2d52af
上级 6c1e0688
隐藏空白字符变更
内嵌 并排
正在显示 包含 64 行增加 和 37 行删除
libs/freetdm/mod_openzap/mod_openzap.2005.vcproj
浏览文件 @ 1a87e3b3
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
WarnAsError="true" WarnAsError="true"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
...@@ -91,6 +91,9 @@ ...@@ -91,6 +91,9 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -120,13 +123,13 @@ ...@@ -120,13 +123,13 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../freeswitch.trunk/src/include;../src/include;../src/isdn/include" AdditionalIncludeDirectories="../../../src/include;../src/include;../src/isdn/include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
WarnAsError="true" WarnAsError="true"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
...@@ -143,7 +146,7 @@ ...@@ -143,7 +146,7 @@
AdditionalDependencies="FreeSwitchCore.lib" AdditionalDependencies="FreeSwitchCore.lib"
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;../../freeswitch.trunk/w32/Library/$(OutDir)&quot;" AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
...@@ -171,6 +174,9 @@ ...@@ -171,6 +174,9 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
......
libs/freetdm/mod_openzap/mod_openzap.2008.vcproj
浏览文件 @ 1a87e3b3
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../freeswitch.trunk/src/include;../src/include;../src/isdn/include" AdditionalIncludeDirectories="../../../src/include;../src/include;../src/isdn/include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
AdditionalDependencies="FreeSwitchCore.lib" AdditionalDependencies="FreeSwitchCore.lib"
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;../../freeswitch.trunk/w32/Library/$(OutDir)&quot;" AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
......
libs/freetdm/msvc/testanalog/testanalog.2008.vcproj
浏览文件 @ 1a87e3b3
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
WarnAsError="true" WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool
...@@ -125,7 +124,6 @@ ...@@ -125,7 +124,6 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
WarnAsError="true" WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
......
libs/freetdm/msvc/testisdn/testisdn.2008.vcproj
浏览文件 @ 1a87e3b3
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
WarnAsError="true" WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool
...@@ -125,7 +124,6 @@ ...@@ -125,7 +124,6 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
WarnAsError="true" WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
......
libs/freetdm/src/ozmod/ozmod_analog/ozmod_analog.2005.vcproj
浏览文件 @ 1a87e3b3
...@@ -46,7 +46,8 @@ ...@@ -46,7 +46,8 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool
...@@ -83,6 +84,9 @@ ...@@ -83,6 +84,9 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -118,8 +122,9 @@ ...@@ -118,8 +122,9 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EXPORTS"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
...@@ -158,6 +163,9 @@ ...@@ -158,6 +163,9 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
......
libs/freetdm/src/ozmod/ozmod_analog/ozmod_analog.2008.vcproj
浏览文件 @ 1a87e3b3
...@@ -47,7 +47,8 @@ ...@@ -47,7 +47,8 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool
...@@ -119,8 +120,9 @@ ...@@ -119,8 +120,9 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EXPORTS"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
......
libs/freetdm/src/ozmod/ozmod_analog_em/ozmod_analog_em.2005.vcproj
浏览文件 @ 1a87e3b3
...@@ -46,7 +46,8 @@ ...@@ -46,7 +46,8 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool
...@@ -121,8 +122,9 @@ ...@@ -121,8 +122,9 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EM_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EM_EXPORTS"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
......
libs/freetdm/src/ozmod/ozmod_analog_em/ozmod_analog_em.2008.vcproj
浏览文件 @ 1a87e3b3
...@@ -47,7 +47,8 @@ ...@@ -47,7 +47,8 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool
...@@ -119,8 +120,9 @@ ...@@ -119,8 +120,9 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EM_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EM_EXPORTS"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
......
libs/freetdm/src/ozmod/ozmod_isdn/ozmod_isdn.2005.vcproj
浏览文件 @ 1a87e3b3
...@@ -41,12 +41,13 @@ ...@@ -41,12 +41,13 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\isdn\include;..\..\include" AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool
...@@ -83,6 +84,9 @@ ...@@ -83,6 +84,9 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -115,11 +119,12 @@ ...@@ -115,11 +119,12 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\isdn\include;..\..\include" AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
...@@ -158,6 +163,9 @@ ...@@ -158,6 +163,9 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
......
libs/freetdm/src/ozmod/ozmod_isdn/ozmod_isdn.2008.vcproj
浏览文件 @ 1a87e3b3
...@@ -42,12 +42,13 @@ ...@@ -42,12 +42,13 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\isdn\include;..\..\include" AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool
...@@ -116,11 +117,12 @@ ...@@ -116,11 +117,12 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\isdn\include;..\..\include" AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
......
libs/freetdm/src/ozmod/ozmod_isdn/ozmod_isdn.c
浏览文件 @ 1a87e3b3
...@@ -497,7 +497,7 @@ static L3INT zap_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen) ...@@ -497,7 +497,7 @@ static L3INT zap_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
zap_span_t *span = (zap_span_t *) pvt; zap_span_t *span = (zap_span_t *) pvt;
zap_isdn_data_t *isdn_data = span->signal_data; zap_isdn_data_t *isdn_data = span->signal_data;
Q931mes_Generic *gen = (Q931mes_Generic *) msg; Q931mes_Generic *gen = (Q931mes_Generic *) msg;
int chan_id = 0; uint32_t chan_id = 0;
int chan_hunt = 0; int chan_hunt = 0;
zap_channel_t *zchan = NULL; zap_channel_t *zchan = NULL;
zap_caller_data_t *caller_data = NULL; zap_caller_data_t *caller_data = NULL;
...@@ -718,7 +718,7 @@ static L3INT zap_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen) ...@@ -718,7 +718,7 @@ static L3INT zap_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
* Channel selection for incoming calls: * Channel selection for incoming calls:
*/ */
if (ZAP_SPAN_IS_NT(span) && chan_hunt) { if (ZAP_SPAN_IS_NT(span) && chan_hunt) {
int x; uint32_t x;
/* /*
* In NT-mode with channel selection "any", * In NT-mode with channel selection "any",
...@@ -1457,9 +1457,10 @@ static void *zap_isdn_tones_run(zap_thread_t *me, void *obj) ...@@ -1457,9 +1457,10 @@ static void *zap_isdn_tones_run(zap_thread_t *me, void *obj)
zap_span_t *span = (zap_span_t *) obj; zap_span_t *span = (zap_span_t *) obj;
zap_isdn_data_t *isdn_data = span->signal_data; zap_isdn_data_t *isdn_data = span->signal_data;
zap_buffer_t *dt_buffer = NULL; zap_buffer_t *dt_buffer = NULL;
teletone_generation_session_t ts; teletone_generation_session_t ts = {0};
unsigned char frame[1024]; unsigned char frame[1024];
int x, interval; uint32_t x;
int interval = 0;
int offset = 0; int offset = 0;
zap_log(ZAP_LOG_DEBUG, "ISDN tones thread starting.\n"); zap_log(ZAP_LOG_DEBUG, "ISDN tones thread starting.\n");
......
libs/freetdm/src/ozmod/ozmod_isdn/zap_isdn.h
浏览文件 @ 1a87e3b3
...@@ -72,7 +72,7 @@ typedef struct zap_isdn_data zap_isdn_data_t; ...@@ -72,7 +72,7 @@ typedef struct zap_isdn_data zap_isdn_data_t;
/* b-channel private data */ /* b-channel private data */
struct zap_isdn_bchan_data struct zap_isdn_bchan_data
{ {
int32_t digit_timeout; L2ULONG digit_timeout;
}; };
typedef struct zap_isdn_bchan_data zap_isdn_bchan_data_t; typedef struct zap_isdn_bchan_data zap_isdn_bchan_data_t;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论