Windows x64 support

This commit is contained in:
Jeff Lenk 2010-05-07 13:19:02 -05:00
parent 26a6b43536
commit edcf5fe0a4
9 changed files with 1364 additions and 683 deletions

View File

@ -61,51 +61,93 @@ EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32 Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|Win32.ActiveCfg = Debug|Win32 {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|Win32.ActiveCfg = Debug|Win32
{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|Win32.Build.0 = Debug|Win32 {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|Win32.Build.0 = Debug|Win32
{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|x64.ActiveCfg = Debug|x64
{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|x64.Build.0 = Debug|x64
{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|Win32.ActiveCfg = Release|Win32 {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|Win32.ActiveCfg = Release|Win32
{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|Win32.Build.0 = Release|Win32 {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|Win32.Build.0 = Release|Win32
{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|x64.ActiveCfg = Release|x64
{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|x64.Build.0 = Release|x64
{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|Win32.ActiveCfg = Debug|Win32 {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|Win32.ActiveCfg = Debug|Win32
{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|Win32.Build.0 = Debug|Win32 {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|Win32.Build.0 = Debug|Win32
{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|x64.ActiveCfg = Debug|x64
{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|x64.Build.0 = Debug|x64
{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|Win32.ActiveCfg = Release|Win32 {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|Win32.ActiveCfg = Release|Win32
{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|Win32.Build.0 = Release|Win32 {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|Win32.Build.0 = Release|Win32
{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|x64.ActiveCfg = Release|x64
{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|x64.Build.0 = Release|x64
{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Debug|Win32.ActiveCfg = Debug|Win32 {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Debug|Win32.ActiveCfg = Debug|Win32
{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Debug|x64.ActiveCfg = Debug|x64
{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|Win32.ActiveCfg = Release|Win32 {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|Win32.ActiveCfg = Release|Win32
{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|Win32.Build.0 = Release|Win32 {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|Win32.Build.0 = Release|Win32
{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|x64.ActiveCfg = Release|x64
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.ActiveCfg = Debug|Win32 {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.ActiveCfg = Debug|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.Build.0 = Debug|Win32 {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.Build.0 = Debug|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|x64.ActiveCfg = Debug|x64
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|x64.Build.0 = Debug|x64
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.ActiveCfg = Release|Win32 {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.ActiveCfg = Release|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.Build.0 = Release|Win32 {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.Build.0 = Release|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|x64.ActiveCfg = Release|x64
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|x64.Build.0 = Release|x64
{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|Win32.ActiveCfg = Debug|Win32 {37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|Win32.ActiveCfg = Debug|Win32
{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|Win32.Build.0 = Debug|Win32 {37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|Win32.Build.0 = Debug|Win32
{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|x64.ActiveCfg = Debug|x64
{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|x64.Build.0 = Debug|x64
{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|Win32.ActiveCfg = Release|Win32 {37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|Win32.ActiveCfg = Release|Win32
{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|Win32.Build.0 = Release|Win32 {37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|Win32.Build.0 = Release|Win32
{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|x64.ActiveCfg = Release|x64
{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|x64.Build.0 = Release|x64
{B3F49375-2834-4937-9D8C-4AC2EC911010}.Debug|Win32.ActiveCfg = Debug|Win32 {B3F49375-2834-4937-9D8C-4AC2EC911010}.Debug|Win32.ActiveCfg = Debug|Win32
{B3F49375-2834-4937-9D8C-4AC2EC911010}.Debug|Win32.Build.0 = Debug|Win32 {B3F49375-2834-4937-9D8C-4AC2EC911010}.Debug|Win32.Build.0 = Debug|Win32
{B3F49375-2834-4937-9D8C-4AC2EC911010}.Debug|x64.ActiveCfg = Debug|x64
{B3F49375-2834-4937-9D8C-4AC2EC911010}.Debug|x64.Build.0 = Debug|x64
{B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|Win32.ActiveCfg = Release|Win32 {B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|Win32.ActiveCfg = Release|Win32
{B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|Win32.Build.0 = Release|Win32 {B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|Win32.Build.0 = Release|Win32
{B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|x64.ActiveCfg = Release|x64
{B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|x64.Build.0 = Release|x64
{729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Debug|Win32.ActiveCfg = Debug|Win32 {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Debug|Win32.ActiveCfg = Debug|Win32
{729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Debug|x64.ActiveCfg = Debug|x64
{729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|Win32.ActiveCfg = Release|Win32 {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|Win32.ActiveCfg = Release|Win32
{729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|Win32.Build.0 = Release|Win32 {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|Win32.Build.0 = Release|Win32
{729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|x64.ActiveCfg = Release|x64
{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Debug|Win32.ActiveCfg = Debug|Win32 {E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Debug|Win32.ActiveCfg = Debug|Win32
{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Debug|x64.ActiveCfg = Debug|x64
{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Release|Win32.ActiveCfg = Release|Win32 {E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Release|Win32.ActiveCfg = Release|Win32
{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Release|x64.ActiveCfg = Release|x64
{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Debug|Win32.ActiveCfg = Debug|Win32 {1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Debug|Win32.ActiveCfg = Debug|Win32
{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Debug|x64.ActiveCfg = Debug|x64
{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Release|Win32.ActiveCfg = Release|Win32 {1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Release|Win32.ActiveCfg = Release|Win32
{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Release|x64.ActiveCfg = Release|x64
{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|Win32.ActiveCfg = Debug|Win32 {D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|Win32.ActiveCfg = Debug|Win32
{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|Win32.Build.0 = Debug|Win32 {D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|Win32.Build.0 = Debug|Win32
{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|x64.ActiveCfg = Debug|x64
{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|x64.Build.0 = Debug|x64
{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|Win32.ActiveCfg = Release|Win32 {D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|Win32.ActiveCfg = Release|Win32
{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|Win32.Build.0 = Release|Win32 {D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|Win32.Build.0 = Release|Win32
{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|x64.ActiveCfg = Release|x64
{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|x64.Build.0 = Release|x64
{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|Win32.ActiveCfg = Debug|Win32 {2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|Win32.ActiveCfg = Debug|Win32
{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|Win32.Build.0 = Debug|Win32 {2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|Win32.Build.0 = Debug|Win32
{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|x64.ActiveCfg = Debug|x64
{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|x64.Build.0 = Debug|x64
{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|Win32.ActiveCfg = Release|Win32 {2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|Win32.ActiveCfg = Release|Win32
{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|Win32.Build.0 = Release|Win32 {2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|Win32.Build.0 = Release|Win32
{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|x64.ActiveCfg = Release|x64
{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|x64.Build.0 = Release|x64
{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|Win32.ActiveCfg = Debug|Win32 {0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|Win32.ActiveCfg = Debug|Win32
{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|Win32.Build.0 = Debug|Win32 {0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|Win32.Build.0 = Debug|Win32
{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|x64.ActiveCfg = Debug|x64
{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|x64.Build.0 = Debug|x64
{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|Win32.ActiveCfg = Release|Win32 {0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|Win32.ActiveCfg = Release|Win32
{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|Win32.Build.0 = Release|Win32 {0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|Win32.Build.0 = Release|Win32
{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|x64.ActiveCfg = Release|x64
{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

@ -94,6 +94,83 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
BuildLogFile="$(IntDir)\BuildLog-freetdm.htm"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../src/include;../src/include/private;../src/isdn/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="false"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
GenerateDebugInformation="true"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
@ -166,83 +243,6 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
BuildLogFile="$(IntDir)\BuildLog-freetdm.htm"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../src/include;../src/isdn/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="false"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
GenerateDebugInformation="true"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
@ -270,7 +270,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../src/include;../src/isdn/include" AdditionalIncludeDirectories="../src/include;../src/include/private;../src/isdn/include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS"
RuntimeLibrary="2" RuntimeLibrary="2"
DisableLanguageExtensions="false" DisableLanguageExtensions="false"

View File

@ -1,191 +1,351 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9.00"
Name="testboost" Name="testboost"
ProjectGUID="{2B1BAF36-0241-43E7-B865-A8338AD48E2E}" ProjectGUID="{2B1BAF36-0241-43E7-B865-A8338AD48E2E}"
RootNamespace="testboost" RootNamespace="testboost"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="131072" TargetFrameworkVersion="131072"
> >
<Platforms> <Platforms>
<Platform <Platform
Name="Win32" Name="Win32"
/> />
</Platforms> <Platform
<ToolFiles> Name="x64"
</ToolFiles> />
<Configurations> </Platforms>
<Configuration <ToolFiles>
Name="Debug|Win32" </ToolFiles>
OutputDirectory="$(SolutionDir)$(ConfigurationName)" <Configurations>
IntermediateDirectory="$(ConfigurationName)" <Configuration
ConfigurationType="1" Name="Debug|Win32"
CharacterSet="1" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
BuildLogFile="$(IntDir)\BuildLog-testboost.htm" IntermediateDirectory="$(ConfigurationName)"
> ConfigurationType="1"
<Tool CharacterSet="1"
Name="VCPreBuildEventTool" BuildLogFile="$(IntDir)\BuildLog-testboost.htm"
/> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCPreBuildEventTool"
/> />
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCCustomBuildTool"
/> />
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCWebServiceProxyGeneratorTool"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCMIDLTool"
Optimization="0" />
AdditionalIncludeDirectories="../../src/include" <Tool
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" Name="VCCLCompilerTool"
MinimalRebuild="true" Optimization="0"
BasicRuntimeChecks="3" AdditionalIncludeDirectories="../../src/include"
RuntimeLibrary="3" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
UsePrecompiledHeader="0" MinimalRebuild="true"
WarningLevel="4" BasicRuntimeChecks="3"
WarnAsError="true" RuntimeLibrary="3"
DebugInformationFormat="4" UsePrecompiledHeader="0"
DisableSpecificWarnings="4100" WarningLevel="4"
/> WarnAsError="true"
<Tool DebugInformationFormat="4"
Name="VCManagedResourceCompilerTool" DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCResourceCompilerTool"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCPreLinkEventTool"
AdditionalDependencies="..\..\debug\freetdm.lib" />
LinkIncremental="2" <Tool
GenerateDebugInformation="true" Name="VCLinkerTool"
SubSystem="1" AdditionalDependencies="..\..\debug\freetdm.lib"
RandomizedBaseAddress="1" LinkIncremental="2"
DataExecutionPrevention="0" GenerateDebugInformation="true"
TargetMachine="1" SubSystem="1"
/> RandomizedBaseAddress="1"
<Tool DataExecutionPrevention="0"
Name="VCALinkTool" TargetMachine="1"
/> />
<Tool <Tool
Name="VCManifestTool" Name="VCALinkTool"
/> />
<Tool <Tool
Name="VCXDCMakeTool" Name="VCManifestTool"
/> />
<Tool <Tool
Name="VCBscMakeTool" Name="VCXDCMakeTool"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCBscMakeTool"
/> />
<Tool <Tool
Name="VCAppVerifierTool" Name="VCFxCopTool"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCAppVerifierTool"
/> />
</Configuration> <Tool
<Configuration Name="VCPostBuildEventTool"
Name="Release|Win32" />
OutputDirectory="$(SolutionDir)$(ConfigurationName)" </Configuration>
IntermediateDirectory="$(ConfigurationName)" <Configuration
ConfigurationType="1" Name="Release|Win32"
CharacterSet="1" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
WholeProgramOptimization="1" IntermediateDirectory="$(ConfigurationName)"
BuildLogFile="$(IntDir)\BuildLog-testboost.htm" ConfigurationType="1"
> CharacterSet="1"
<Tool WholeProgramOptimization="1"
Name="VCPreBuildEventTool" BuildLogFile="$(IntDir)\BuildLog-testboost.htm"
/> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCPreBuildEventTool"
/> />
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCCustomBuildTool"
/> />
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCWebServiceProxyGeneratorTool"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCMIDLTool"
AdditionalIncludeDirectories="../../src/include" />
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" <Tool
RuntimeLibrary="2" Name="VCCLCompilerTool"
UsePrecompiledHeader="0" AdditionalIncludeDirectories="../../src/include"
WarningLevel="4" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
WarnAsError="true" RuntimeLibrary="2"
DebugInformationFormat="3" UsePrecompiledHeader="0"
DisableSpecificWarnings="4100" WarningLevel="4"
/> WarnAsError="true"
<Tool DebugInformationFormat="3"
Name="VCManagedResourceCompilerTool" DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCResourceCompilerTool"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCPreLinkEventTool"
LinkIncremental="1" />
GenerateDebugInformation="true" <Tool
SubSystem="1" Name="VCLinkerTool"
OptimizeReferences="2" LinkIncremental="1"
EnableCOMDATFolding="2" GenerateDebugInformation="true"
RandomizedBaseAddress="1" SubSystem="1"
DataExecutionPrevention="0" OptimizeReferences="2"
TargetMachine="1" EnableCOMDATFolding="2"
/> RandomizedBaseAddress="1"
<Tool DataExecutionPrevention="0"
Name="VCALinkTool" TargetMachine="1"
/> />
<Tool <Tool
Name="VCManifestTool" Name="VCALinkTool"
/> />
<Tool <Tool
Name="VCXDCMakeTool" Name="VCManifestTool"
/> />
<Tool <Tool
Name="VCBscMakeTool" Name="VCXDCMakeTool"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCBscMakeTool"
/> />
<Tool <Tool
Name="VCAppVerifierTool" Name="VCFxCopTool"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCAppVerifierTool"
/> />
</Configuration> <Tool
</Configurations> Name="VCPostBuildEventTool"
<References> />
</References> </Configuration>
<Files> <Configuration
<Filter Name="Debug|x64"
Name="Source Files" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" ConfigurationType="1"
> CharacterSet="1"
<File BuildLogFile="$(IntDir)\BuildLog-testboost.htm"
RelativePath="..\..\src\testboost.c" >
> <Tool
</File> Name="VCPreBuildEventTool"
</Filter> />
</Files> <Tool
<Globals> Name="VCCustomBuildTool"
</Globals> />
</VisualStudioProject> <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../src/include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\..\debug\freetdm.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
BuildLogFile="$(IntDir)\BuildLog-testboost.htm"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../src/include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\testboost.c"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -12,6 +12,9 @@
<Platform <Platform
Name="Win32" Name="Win32"
/> />
<Platform
Name="x64"
/>
</Platforms> </Platforms>
<ToolFiles> <ToolFiles>
</ToolFiles> </ToolFiles>
@ -171,6 +174,163 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
BuildLogFile="$(IntDir)\BuildLog-testsangomaboost.htm"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../src/include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\..\debug\freetdm.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
BuildLogFile="$(IntDir)\BuildLog-testsangomaboost.htm"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../src/include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations> </Configurations>
<References> <References>
</References> </References>

View File

@ -419,7 +419,7 @@ FT_DECLARE(ftdm_status_t) ftdm_interrupt_multiple_wait(ftdm_interrupt_t *interru
} }
} }
res = WaitForMultipleObjects(size+numdevices, ints, FALSE, ms >= 0 ? ms : INFINITE); res = WaitForMultipleObjects((DWORD)size+numdevices, ints, FALSE, ms >= 0 ? ms : INFINITE);
switch (res) { switch (res) {
case WAIT_TIMEOUT: case WAIT_TIMEOUT:

View File

@ -1,197 +1,353 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9.00"
Name="ftmod_pika" Name="ftmod_pika"
ProjectGUID="{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}" ProjectGUID="{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}"
RootNamespace="ftmod_pika" RootNamespace="ftmod_pika"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="196613" TargetFrameworkVersion="196613"
> >
<Platforms> <Platforms>
<Platform <Platform
Name="Win32" Name="Win32"
/> />
</Platforms> <Platform
<ToolFiles> Name="x64"
</ToolFiles> />
<Configurations> </Platforms>
<Configuration <ToolFiles>
Name="Debug|Win32" </ToolFiles>
OutputDirectory="$(SolutionDir)$(ConfigurationName)" <Configurations>
IntermediateDirectory="$(ConfigurationName)" <Configuration
ConfigurationType="2" Name="Debug|Win32"
CharacterSet="1" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
> IntermediateDirectory="$(ConfigurationName)"
<Tool ConfigurationType="2"
Name="VCPreBuildEventTool" CharacterSet="1"
/> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCPreBuildEventTool"
/> />
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCCustomBuildTool"
/> />
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCWebServiceProxyGeneratorTool"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCMIDLTool"
Optimization="0" />
AdditionalIncludeDirectories="..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc" <Tool
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS" Name="VCCLCompilerTool"
MinimalRebuild="true" Optimization="0"
BasicRuntimeChecks="3" AdditionalIncludeDirectories="..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc"
RuntimeLibrary="3" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS"
UsePrecompiledHeader="0" MinimalRebuild="true"
WarningLevel="3" BasicRuntimeChecks="3"
DebugInformationFormat="4" RuntimeLibrary="3"
/> UsePrecompiledHeader="0"
<Tool WarningLevel="3"
Name="VCManagedResourceCompilerTool" DebugInformationFormat="4"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCResourceCompilerTool"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCPreLinkEventTool"
AdditionalDependencies="pikahmpapi.lib" />
LinkIncremental="2" <Tool
AdditionalLibraryDirectories="..\..\..\pika\aoh\lib" Name="VCLinkerTool"
GenerateDebugInformation="true" AdditionalDependencies="pikahmpapi.lib"
SubSystem="2" LinkIncremental="2"
TargetMachine="1" AdditionalLibraryDirectories="..\..\..\pika\aoh\lib"
/> GenerateDebugInformation="true"
<Tool SubSystem="2"
Name="VCALinkTool" TargetMachine="1"
/> />
<Tool <Tool
Name="VCManifestTool" Name="VCALinkTool"
/> />
<Tool <Tool
Name="VCXDCMakeTool" Name="VCManifestTool"
/> />
<Tool <Tool
Name="VCBscMakeTool" Name="VCXDCMakeTool"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCBscMakeTool"
/> />
<Tool <Tool
Name="VCAppVerifierTool" Name="VCFxCopTool"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCAppVerifierTool"
/> />
</Configuration> <Tool
<Configuration Name="VCPostBuildEventTool"
Name="Release|Win32" />
OutputDirectory="$(SolutionDir)$(ConfigurationName)" </Configuration>
IntermediateDirectory="$(ConfigurationName)" <Configuration
ConfigurationType="2" Name="Release|Win32"
CharacterSet="1" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
WholeProgramOptimization="1" IntermediateDirectory="$(ConfigurationName)"
> ConfigurationType="2"
<Tool CharacterSet="1"
Name="VCPreBuildEventTool" WholeProgramOptimization="1"
/> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCPreBuildEventTool"
/> />
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCCustomBuildTool"
/> />
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCWebServiceProxyGeneratorTool"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCMIDLTool"
Optimization="2" />
EnableIntrinsicFunctions="true" <Tool
AdditionalIncludeDirectories="..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc" Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS" Optimization="2"
RuntimeLibrary="2" EnableIntrinsicFunctions="true"
EnableFunctionLevelLinking="true" AdditionalIncludeDirectories="..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc"
UsePrecompiledHeader="0" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS"
WarningLevel="3" RuntimeLibrary="2"
DebugInformationFormat="3" EnableFunctionLevelLinking="true"
/> UsePrecompiledHeader="0"
<Tool WarningLevel="3"
Name="VCManagedResourceCompilerTool" DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCResourceCompilerTool"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCPreLinkEventTool"
AdditionalDependencies="pikahmpapi.lib" />
LinkIncremental="1" <Tool
AdditionalLibraryDirectories="..\..\..\pika\aoh\lib" Name="VCLinkerTool"
GenerateDebugInformation="true" AdditionalDependencies="pikahmpapi.lib"
SubSystem="2" LinkIncremental="1"
OptimizeReferences="2" AdditionalLibraryDirectories="..\..\..\pika\aoh\lib"
EnableCOMDATFolding="2" GenerateDebugInformation="true"
TargetMachine="1" SubSystem="2"
/> OptimizeReferences="2"
<Tool EnableCOMDATFolding="2"
Name="VCALinkTool" TargetMachine="1"
/> />
<Tool <Tool
Name="VCManifestTool" Name="VCALinkTool"
/> />
<Tool <Tool
Name="VCXDCMakeTool" Name="VCManifestTool"
/> />
<Tool <Tool
Name="VCBscMakeTool" Name="VCXDCMakeTool"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCBscMakeTool"
/> />
<Tool <Tool
Name="VCAppVerifierTool" Name="VCFxCopTool"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCAppVerifierTool"
/> />
</Configuration> <Tool
</Configurations> Name="VCPostBuildEventTool"
<References> />
</References> </Configuration>
<Files> <Configuration
<Filter Name="Debug|x64"
Name="Source Files" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" ConfigurationType="2"
> CharacterSet="1"
<File >
RelativePath=".\ftmod_pika.c" <Tool
> Name="VCPreBuildEventTool"
</File> />
</Filter> <Tool
<Filter Name="VCCustomBuildTool"
Name="Header Files" />
Filter="h;hpp;hxx;hm;inl;inc;xsd" <Tool
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" Name="VCXMLDataGeneratorTool"
> />
<File <Tool
RelativePath=".\ftdm_pika.h" Name="VCWebServiceProxyGeneratorTool"
> />
</File> <Tool
</Filter> Name="VCMIDLTool"
</Files> TargetEnvironment="3"
<Globals> />
</Globals> <Tool
</VisualStudioProject> Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="pikahmpapi.lib"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\pika\aoh\lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="pikahmpapi.lib"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\pika\aoh\lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\ftmod_pika.c"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\ftdm_pika.h"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -1,215 +1,373 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9.00"
Name="ftmod_sangoma_boost" Name="ftmod_sangoma_boost"
ProjectGUID="{D021EF2A-460D-4827-A0F7-41FDECF46F1B}" ProjectGUID="{D021EF2A-460D-4827-A0F7-41FDECF46F1B}"
RootNamespace="ftmod_sangoma_boost" RootNamespace="ftmod_sangoma_boost"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="196613" TargetFrameworkVersion="196613"
> >
<Platforms> <Platforms>
<Platform <Platform
Name="Win32" Name="Win32"
/> />
</Platforms> <Platform
<ToolFiles> Name="x64"
</ToolFiles> />
<Configurations> </Platforms>
<Configuration <ToolFiles>
Name="Debug|Win32" </ToolFiles>
OutputDirectory="$(SolutionDir)$(ConfigurationName)" <Configurations>
IntermediateDirectory="$(ConfigurationName)" <Configuration
ConfigurationType="2" Name="Debug|Win32"
CharacterSet="1" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
> IntermediateDirectory="$(ConfigurationName)"
<Tool ConfigurationType="2"
Name="VCPreBuildEventTool" CharacterSet="1"
/> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCPreBuildEventTool"
/> />
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCCustomBuildTool"
/> />
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCWebServiceProxyGeneratorTool"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCMIDLTool"
Optimization="0" />
AdditionalIncludeDirectories="..\..\include;..\..\isdn\include" <Tool
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS" Name="VCCLCompilerTool"
MinimalRebuild="true" Optimization="0"
BasicRuntimeChecks="3" AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
RuntimeLibrary="3" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS"
UsePrecompiledHeader="0" MinimalRebuild="true"
WarningLevel="4" BasicRuntimeChecks="3"
WarnAsError="true" RuntimeLibrary="3"
DebugInformationFormat="4" UsePrecompiledHeader="0"
DisableSpecificWarnings="4100" WarningLevel="4"
/> WarnAsError="true"
<Tool DebugInformationFormat="4"
Name="VCManagedResourceCompilerTool" DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCResourceCompilerTool"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCPreLinkEventTool"
AdditionalDependencies="freetdm.lib" />
LinkIncremental="2" <Tool
AdditionalLibraryDirectories="&quot;$(OutDir)&quot;" Name="VCLinkerTool"
GenerateDebugInformation="true" AdditionalDependencies="freetdm.lib"
SubSystem="2" LinkIncremental="2"
TargetMachine="1" AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
/> GenerateDebugInformation="true"
<Tool SubSystem="2"
Name="VCALinkTool" TargetMachine="1"
/> />
<Tool <Tool
Name="VCManifestTool" Name="VCALinkTool"
/> />
<Tool <Tool
Name="VCXDCMakeTool" Name="VCManifestTool"
/> />
<Tool <Tool
Name="VCBscMakeTool" Name="VCXDCMakeTool"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCBscMakeTool"
/> />
<Tool <Tool
Name="VCAppVerifierTool" Name="VCFxCopTool"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCAppVerifierTool"
/> />
</Configuration> <Tool
<Configuration Name="VCPostBuildEventTool"
Name="Release|Win32" />
OutputDirectory="$(SolutionDir)$(ConfigurationName)" </Configuration>
IntermediateDirectory="$(ConfigurationName)" <Configuration
ConfigurationType="2" Name="Release|Win32"
CharacterSet="1" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
WholeProgramOptimization="1" IntermediateDirectory="$(ConfigurationName)"
> ConfigurationType="2"
<Tool CharacterSet="1"
Name="VCPreBuildEventTool" WholeProgramOptimization="1"
/> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCPreBuildEventTool"
/> />
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCCustomBuildTool"
/> />
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCWebServiceProxyGeneratorTool"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCMIDLTool"
Optimization="2" />
EnableIntrinsicFunctions="true" <Tool
AdditionalIncludeDirectories="..\..\include" Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS" Optimization="2"
RuntimeLibrary="2" EnableIntrinsicFunctions="true"
EnableFunctionLevelLinking="true" AdditionalIncludeDirectories="..\..\include"
UsePrecompiledHeader="0" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS"
WarningLevel="4" RuntimeLibrary="2"
WarnAsError="true" EnableFunctionLevelLinking="true"
DebugInformationFormat="3" UsePrecompiledHeader="0"
DisableSpecificWarnings="4100" WarningLevel="4"
/> WarnAsError="true"
<Tool DebugInformationFormat="3"
Name="VCManagedResourceCompilerTool" DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCResourceCompilerTool"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCPreLinkEventTool"
LinkIncremental="1" />
GenerateDebugInformation="true" <Tool
SubSystem="2" Name="VCLinkerTool"
OptimizeReferences="2" LinkIncremental="1"
EnableCOMDATFolding="2" GenerateDebugInformation="true"
TargetMachine="1" SubSystem="2"
/> OptimizeReferences="2"
<Tool EnableCOMDATFolding="2"
Name="VCALinkTool" TargetMachine="1"
/> />
<Tool <Tool
Name="VCManifestTool" Name="VCALinkTool"
/> />
<Tool <Tool
Name="VCXDCMakeTool" Name="VCManifestTool"
/> />
<Tool <Tool
Name="VCBscMakeTool" Name="VCXDCMakeTool"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCBscMakeTool"
/> />
<Tool <Tool
Name="VCAppVerifierTool" Name="VCFxCopTool"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCAppVerifierTool"
/> />
</Configuration> <Tool
</Configurations> Name="VCPostBuildEventTool"
<References> />
</References> </Configuration>
<Files> <Configuration
<Filter Name="Debug|x64"
Name="Source Files" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" ConfigurationType="2"
> CharacterSet="1"
<File >
RelativePath="ftmod_sangoma_boost.c" <Tool
> Name="VCPreBuildEventTool"
</File> />
<File <Tool
RelativePath="sangoma_boost_client.c" Name="VCCustomBuildTool"
> />
</File> <Tool
</Filter> Name="VCXMLDataGeneratorTool"
<Filter />
Name="Header Files" <Tool
Filter="h;hpp;hxx;hm;inl;inc;xsd" Name="VCWebServiceProxyGeneratorTool"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" />
> <Tool
<File Name="VCMIDLTool"
RelativePath="sangoma_boost_client.h" TargetEnvironment="3"
> />
</File> <Tool
<File Name="VCCLCompilerTool"
RelativePath="sangoma_boost_interface.h" Optimization="0"
> AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
</File> PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS"
<File MinimalRebuild="true"
RelativePath="sigboost.h" BasicRuntimeChecks="3"
> RuntimeLibrary="3"
</File> UsePrecompiledHeader="0"
<File WarningLevel="4"
RelativePath="ftdm_sangoma_boost.h" WarnAsError="true"
> DebugInformationFormat="3"
</File> DisableSpecificWarnings="4100"
</Filter> />
</Files> <Tool
<Globals> Name="VCManagedResourceCompilerTool"
</Globals> />
</VisualStudioProject> <Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="freetdm.lib"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="ftmod_sangoma_boost.c"
>
</File>
<File
RelativePath="sangoma_boost_client.c"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="ftdm_sangoma_boost.h"
>
</File>
<File
RelativePath="sangoma_boost_client.h"
>
</File>
<File
RelativePath="sangoma_boost_interface.h"
>
</File>
<File
RelativePath="sigboost.h"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -292,7 +292,7 @@ sangomabc_event_t *__sangomabc_connection_read(sangomabc_connection_t *mcon, int
if (mcon->sigmod) { if (mcon->sigmod) {
e = ftdm_queue_dequeue(mcon->boost_queue); e = ftdm_queue_dequeue(mcon->boost_queue);
if (e) { if (e) {
bytes = e->size; bytes = (int)e->size;
memcpy(&mcon->event, e->boostmsg, bytes); memcpy(&mcon->event, e->boostmsg, bytes);
ftdm_safe_free(e); ftdm_safe_free(e);
} }

View File

@ -266,7 +266,12 @@ int main(int argc, char *argv[])
} }
/* register a handler to shutdown things properly */ /* register a handler to shutdown things properly */
#ifdef _WIN64
// still trying to figure this one out otherwise triggers error
if (signal(SIGINT, interrupt_requested) < 0) {
#else
if (signal(SIGINT, interrupt_requested) == SIG_ERR) { if (signal(SIGINT, interrupt_requested) == SIG_ERR) {
#endif
fprintf(stderr, "Could not set the SIGINT signal handler: %s\n", strerror(errno)); fprintf(stderr, "Could not set the SIGINT signal handler: %s\n", strerror(errno));
exit(-1); exit(-1);
} }