Revision

17247

Author

moy

Date

2010-04-09 11:29:58 -0500 (Fri, 09 Apr 2010)

Log Message

fix boost win compilation

Modified Paths

• freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
• freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2008.vcproj

Diff

--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c	2010-04-08 17:25:44 UTC (rev 17246)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c	2010-04-09 16:29:58 UTC (rev 17247)
@@ -356,7 +356,7 @@
 	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 @@
 	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;
 	}

--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2008.vcproj	2010-04-08 17:25:44 UTC (rev 17246)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2008.vcproj	2010-04-09 16:29:58 UTC (rev 17247)
@@ -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"