fix boost win compilation

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
index a258184d014b866384c9ecdd641d6b3dca7ec146..59088a3c01b17171eb2f0ba4efec1032c599d870 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
@@ -356,7 +356,7 @@ static FIO_CHANNEL_REQUEST_FUNCTION(sangoma_boost_channel_request)
        ftdm_set_string(event.calling_name, caller_data->cid_name);
        ftdm_set_string(event.rdnis.digits, caller_data->rdnis.digits);
        if (strlen(caller_data->rdnis.digits)) {
-                       event.rdnis.digits_count = strlen(caller_data->rdnis.digits)+1;
+                       event.rdnis.digits_count = (uint8_t)strlen(caller_data->rdnis.digits)+1;
                        event.rdnis.ton = caller_data->rdnis.type;
                        event.rdnis.npi = caller_data->rdnis.plan;
        }
@@ -474,7 +474,7 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(sangoma_boost_outgoing_call)
        ftdm_set_string(event.calling_name, ftdmchan->caller_data.cid_name);
        ftdm_set_string(event.rdnis.digits, ftdmchan->caller_data.rdnis.digits);
        if (strlen(ftdmchan->caller_data.rdnis.digits)) {
-                       event.rdnis.digits_count = strlen(ftdmchan->caller_data.rdnis.digits)+1;
+                       event.rdnis.digits_count = (uint8_t)strlen(ftdmchan->caller_data.rdnis.digits)+1;
                        event.rdnis.ton = ftdmchan->caller_data.rdnis.type;
                        event.rdnis.npi = ftdmchan->caller_data.rdnis.plan;
        }

diff --git a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2008.vcproj b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2008.vcproj
index bfc50b746864180bf4f3d3a2fd3e5dafaf327019..b7698ec7a7f26193d98f1a460c6a6f69d5e63b18 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2008.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2008.vcproj
@@ -67,7 +67,7 @@
                                Name="VCLinkerTool"
                                AdditionalDependencies="freetdm.lib libsangoma.lib"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories=""$(OutDir)";"C:\Program Files\Sangoma\lib""
+                               AdditionalLibraryDirectories=""$(OutDir)";"C:\Program Files\Sangoma\api\lib\x86""
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                RandomizedBaseAddress="1"
@@ -97,11 +97,12 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="2"
                        CharacterSet="2"
+                       WholeProgramOptimization="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -117,16 +118,12 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
                                AdditionalIncludeDirectories="../../../src/include;../../../src/isdn/include;../../../wanpipe/include"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+                               RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -144,13 +141,15 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="freetdm.lib libsangoma.lib"
-                               LinkIncremental="2"
-                               AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x64"
+                               LinkIncremental="1"
+                               AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x86"
                                GenerateDebugInformation="true"
                                SubSystem="1"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
-                               TargetMachine="17"
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -175,12 +174,11 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="2"
                        CharacterSet="2"
-                       WholeProgramOptimization="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -196,12 +194,16 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="0"
                                AdditionalIncludeDirectories="../../../src/include;../../../src/isdn/include;../../../wanpipe/include"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                               RuntimeLibrary="2"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -219,15 +221,13 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="freetdm.lib libsangoma.lib"
-                               LinkIncremental="1"
-                               AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x86"
+                               LinkIncremental="2"
+                               AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x64"
                                GenerateDebugInformation="true"
                                SubSystem="1"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
-                               TargetMachine="1"
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"