cleanup msvc build and fix msvc build warnings

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@689 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/openzap/mod_openzap/mod_openzap.2005.vcproj b/libs/openzap/mod_openzap/mod_openzap.2005.vcproj
index 800fea482cb5a45822dea23665960590459da10c..959115d3d8f072eb71f841e607d6eaced88efb2f 100644 (file)
--- a/libs/openzap/mod_openzap/mod_openzap.2005.vcproj
+++ b/libs/openzap/mod_openzap/mod_openzap.2005.vcproj
@@ -49,7 +49,7 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
@@ -91,6 +91,9 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -120,13 +123,13 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../freeswitch.trunk/src/include;../src/include;../src/isdn/include"\r
+                               AdditionalIncludeDirectories="../../../src/include;../src/include;../src/isdn/include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
@@ -143,7 +146,7 @@
                                AdditionalDependencies="FreeSwitchCore.lib"\r
                                OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;../../freeswitch.trunk/w32/Library/$(OutDir)&quot;"\r
+                               AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"\r
                                SubSystem="2"\r
@@ -171,6 +174,9 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r

diff --git a/libs/openzap/mod_openzap/mod_openzap.2008.vcproj b/libs/openzap/mod_openzap/mod_openzap.2008.vcproj
index 68be586a018b1eb851e415c8b03efcb32df0fe89..fca3f9b9d74bca5306248e8d81c9bf40c209f811 100644 (file)
--- a/libs/openzap/mod_openzap/mod_openzap.2008.vcproj
+++ b/libs/openzap/mod_openzap/mod_openzap.2008.vcproj
@@ -123,7 +123,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../freeswitch.trunk/src/include;../src/include;../src/isdn/include"\r
+                               AdditionalIncludeDirectories="../../../src/include;../src/include;../src/isdn/include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -146,7 +146,7 @@
                                AdditionalDependencies="FreeSwitchCore.lib"\r
                                OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;../../freeswitch.trunk/w32/Library/$(OutDir)&quot;"\r
+                               AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"\r
                                SubSystem="2"\r

diff --git a/libs/openzap/msvc/testanalog/testanalog.2008.vcproj b/libs/openzap/msvc/testanalog/testanalog.2008.vcproj
index 7400debad086a74e1b5c77bb9e84df41532fc028..e3293649f5d60a813f9ea8b0f44b62af34901ccf 100644 (file)
--- a/libs/openzap/msvc/testanalog/testanalog.2008.vcproj
+++ b/libs/openzap/msvc/testanalog/testanalog.2008.vcproj
@@ -50,7 +50,6 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -125,7 +124,6 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r

diff --git a/libs/openzap/msvc/testisdn/testisdn.2008.vcproj b/libs/openzap/msvc/testisdn/testisdn.2008.vcproj
index 32893d6ac7359d78de5109f2cb113bcbe3abf672..3fac540c637615790ae1cde2facc954233c9dcc3 100644 (file)
--- a/libs/openzap/msvc/testisdn/testisdn.2008.vcproj
+++ b/libs/openzap/msvc/testisdn/testisdn.2008.vcproj
@@ -50,7 +50,6 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -125,7 +124,6 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r

diff --git a/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2005.vcproj b/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2005.vcproj
index 016bd6bc58259e0987c2c2969520526c7cba4f73..f0d697c6196fc8f7dc281430d8b5127e124b3621 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2005.vcproj
+++ b/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2005.vcproj
@@ -46,7 +46,8 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -83,6 +84,9 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -118,8 +122,9 @@
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="2"\r
-                               WarningLevel="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
@@ -158,6 +163,9 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r

diff --git a/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2008.vcproj b/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2008.vcproj
index 1fb02161f1d5574469fafb9cae90213d7d667461..2a07fd9dc6856fa1dc9c279b54efc5029cc03386 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2008.vcproj
+++ b/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2008.vcproj
@@ -47,7 +47,8 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -119,8 +120,9 @@
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="2"\r
-                               WarningLevel="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r

diff --git a/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2005.vcproj b/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2005.vcproj
index 4f64372f02ea260238be60be64e7bb0082329829..3cc853b688bbd3ac1d51cd1038fd1fb755348b96 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2005.vcproj
+++ b/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2005.vcproj
@@ -46,7 +46,8 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -121,8 +122,9 @@
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EM_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="2"\r
-                               WarningLevel="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r

diff --git a/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2008.vcproj b/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2008.vcproj
index 50d0d06d03498dfc638b6266b1cb0c3bdf315c28..9156c463d25f30777c8815df225b472a3f259c47 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2008.vcproj
+++ b/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2008.vcproj
@@ -47,7 +47,8 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -119,8 +120,9 @@
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EM_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="2"\r
-                               WarningLevel="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r

diff --git a/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.2005.vcproj b/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.2005.vcproj
index 80689f6f2db7db1700ed1dad8b1e86df4e880127..19dc74fd8fb116b330cadd1d8215f9ba2c82c974 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.2005.vcproj
+++ b/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.2005.vcproj
@@ -41,12 +41,13 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -83,6 +84,9 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -115,11 +119,12 @@
                                Optimization="2"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="2"\r
-                               WarningLevel="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
@@ -158,6 +163,9 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r

diff --git a/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.2008.vcproj b/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.2008.vcproj
index 77f3bb6f46c935679a3ae4762e7fd90bcfdc6602..de6f1718b1b51cdbd1309dd456a34c57e2e06bee 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.2008.vcproj
+++ b/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.2008.vcproj
@@ -42,12 +42,13 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -116,11 +117,12 @@
                                Optimization="2"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="2"\r
-                               WarningLevel="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r

diff --git a/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c b/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c
index 43bada21b16196a72e7eb8eee439a6408154f48e..885c4fd9dcc980f6cba0a6f6c038a62434b1e14b 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c
+++ b/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c
@@ -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");

diff --git a/libs/openzap/src/ozmod/ozmod_isdn/zap_isdn.h b/libs/openzap/src/ozmod/ozmod_isdn/zap_isdn.h
index 14b2731db51e80c0cb5d1f4dcf253d4ca011052a..f33a9b211f8a88e81946b6435e640c6f035f8208 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_isdn/zap_isdn.h
+++ b/libs/openzap/src/ozmod/ozmod_isdn/zap_isdn.h
@@ -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;