retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

cleanup msvc build and fix msvc build warnings 

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@689 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Michael Jerris 2009-03-10 17:42:49 +00:00
parent f7ed3201a8
commit 4a39698133
12 changed files with 64 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/openzap/mod_openzap/mod_openzap.2005.vcproj
View File

@ -49,7 +49,7 @@
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
@ -91,6 +91,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
@ -120,13 +123,13 @@
/>
<Tool
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"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
@ -143,7 +146,7 @@
AdditionalDependencies="FreeSwitchCore.lib"
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;../../freeswitch.trunk/w32/Library/$(OutDir)&quot;"
AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
@ -171,6 +174,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>

4
libs/openzap/mod_openzap/mod_openzap.2008.vcproj
View File

@ -123,7 +123,7 @@
/>
<Tool
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"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@ -146,7 +146,7 @@
AdditionalDependencies="FreeSwitchCore.lib"
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;../../freeswitch.trunk/w32/Library/$(OutDir)&quot;"
AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"

2
libs/openzap/msvc/testanalog/testanalog.2008.vcproj
View File

@ -50,7 +50,6 @@
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@ -125,7 +124,6 @@
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool

2
libs/openzap/msvc/testisdn/testisdn.2008.vcproj
View File

@ -50,7 +50,6 @@
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@ -125,7 +124,6 @@
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool

14
libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2005.vcproj
View File

@ -46,7 +46,8 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="4"
/>
<Tool
@ -83,6 +84,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
@ -118,8 +122,9 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EXPORTS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="3"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3"
/>
<Tool
@ -158,6 +163,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>

8
libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2008.vcproj
View File

@ -47,7 +47,8 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="4"
/>
<Tool
@ -119,8 +120,9 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EXPORTS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="3"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3"
/>
<Tool

8
libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2005.vcproj
View File

@ -46,7 +46,8 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="4"
/>
<Tool
@ -121,8 +122,9 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EM_EXPORTS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="3"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3"
/>
<Tool

8
libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2008.vcproj
View File

@ -47,7 +47,8 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="4"
/>
<Tool
@ -119,8 +120,9 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EM_EXPORTS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="3"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3"
/>
<Tool

18
libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.2005.vcproj
View File

@ -41,12 +41,13 @@
Name="VCCLCompilerTool"
Optimization="0"
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"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="4"
/>
<Tool
@ -83,6 +84,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
@ -115,11 +119,12 @@
Optimization="2"
EnableIntrinsicFunctions="true"
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"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="3"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3"
/>
<Tool
@ -158,6 +163,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>

12
libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.2008.vcproj
View File

@ -42,12 +42,13 @@
Name="VCCLCompilerTool"
Optimization="0"
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"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="4"
/>
<Tool
@ -116,11 +117,12 @@
Optimization="2"
EnableIntrinsicFunctions="true"
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"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="3"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3"
/>
<Tool

9
libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c
View File

@ -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_isdn_data_t *isdn_data = span->signal_data;
Q931mes_Generic *gen = (Q931mes_Generic *) msg;
int chan_id = 0;
uint32_t chan_id = 0;
int chan_hunt = 0;
zap_channel_t *zchan = NULL;
zap_caller_data_t *caller_data = NULL;
@ -718,7 +718,7 @@ static L3INT zap_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
* Channel selection for incoming calls:
*/
if (ZAP_SPAN_IS_NT(span) && chan_hunt) {
int x;
uint32_t x;
/*
* In NT-mode with channel selection "any",
@ -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_isdn_data_t *isdn_data = span->signal_data;
zap_buffer_t *dt_buffer = NULL;
teletone_generation_session_t ts;
teletone_generation_session_t ts = {0};
unsigned char frame[1024];
int x, interval;
uint32_t x;
int interval = 0;
int offset = 0;
zap_log(ZAP_LOG_DEBUG, "ISDN tones thread starting.\n");

2
libs/openzap/src/ozmod/ozmod_isdn/zap_isdn.h
View File

@ -72,7 +72,7 @@ typedef struct zap_isdn_data zap_isdn_data_t;
/* b-channel private data */
struct zap_isdn_bchan_data
{
int32_t digit_timeout;
L2ULONG digit_timeout;
};
typedef struct zap_isdn_bchan_data zap_isdn_bchan_data_t;