]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
build: get base of windows build for openzap going again (OPENZAP-55)
authorMichael Jerris <mike@jerris.com>
Fri, 6 Mar 2009 18:17:15 +0000 (18:17 +0000)
committerMichael Jerris <mike@jerris.com>
Fri, 6 Mar 2009 18:17:15 +0000 (18:17 +0000)
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@682 a93c3328-9c30-0410-af19-c9cd2b2d52af

21 files changed:
libs/openzap/mod_openzap/mod_openzap.2005.vcproj [moved from libs/openzap/mod_openzap/mod_openzap.vcproj with 89% similarity]
libs/openzap/mod_openzap/mod_openzap.2008.vcproj [new file with mode: 0644]
libs/openzap/mod_openzap/mod_openzap.c
libs/openzap/msvc/openzap.2005.vcproj [new file with mode: 0644]
libs/openzap/msvc/openzap.2008.vcproj [new file with mode: 0644]
libs/openzap/msvc/openzap.vcproj [deleted file]
libs/openzap/msvc/testanalog/testanalog.2005.vcproj [moved from libs/openzap/msvc/testanalog/testanalog.vcproj with 100% similarity]
libs/openzap/msvc/testanalog/testanalog.2008.vcproj [new file with mode: 0644]
libs/openzap/msvc/testisdn/testisdn.2005.vcproj [moved from libs/openzap/msvc/testisdn/testisdn.vcproj with 100% similarity]
libs/openzap/msvc/testisdn/testisdn.2008.vcproj [new file with mode: 0644]
libs/openzap/openzap.2005.sln [moved from libs/openzap/openzap.sln with 79% similarity]
libs/openzap/openzap.2008.sln [new file with mode: 0644]
libs/openzap/src/hashtable.c
libs/openzap/src/include/hashtable_private.h
libs/openzap/src/include/openzap.h
libs/openzap/src/isdn/Q921.c
libs/openzap/src/zap_buffer.c
libs/openzap/src/zap_callerid.c
libs/openzap/src/zap_config.c
libs/openzap/src/zap_dso.c
libs/openzap/src/zap_io.c

similarity index 89%
rename from libs/openzap/mod_openzap/mod_openzap.vcproj
rename to libs/openzap/mod_openzap/mod_openzap.2005.vcproj
index a1ebe71e9a9cb8ec919d808014b2310551199101..800fea482cb5a45822dea23665960590459da10c 100644 (file)
@@ -41,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../freeswitch.trunk/src/include;../src/include;../src/isdn/include"\r
+                               AdditionalIncludeDirectories="../../../src/include;../src/include;../src/isdn/include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -66,7 +66,7 @@
                                AdditionalDependencies="FreeSwitchCore.lib"\r
                                OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
                                LinkIncremental="2"\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
@@ -91,9 +91,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                        <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
new file mode 100644 (file)
index 0000000..68be586
--- /dev/null
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="mod_openzap"\r
+       ProjectGUID="{FE3540C5-3303-46E0-A69E-D92F775687F1}"\r
+       RootNamespace="mod_openzap"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../../src/include;../src/include;../src/isdn/include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="FreeSwitchCore.lib"\r
+                               OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"\r
+                               SubSystem="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               ImportLibrary="$(OutDir)/mod_openzap.lib"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="../../freeswitch.trunk/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="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="FreeSwitchCore.lib"\r
+                               OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="&quot;../../freeswitch.trunk/w32/Library/$(OutDir)&quot;"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               LinkTimeCodeGeneration="1"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               ImportLibrary="$(OutDir)/mod_openzap.lib"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\mod_openzap.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index 590c22112ae0e0e2da360410f58adf667b4bd58c..f8a987449f8983e533533343066d6033b2b41ec9 100644 (file)
@@ -617,7 +617,7 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
        }
 
        *frame = &tech_pvt->read_frame;
-       tech_pvt->read_frame.datalen = len;
+       tech_pvt->read_frame.datalen = (uint32_t)len;
        tech_pvt->read_frame.samples = tech_pvt->read_frame.datalen;
 
        if (tech_pvt->zchan->effective_codec == ZAP_CODEC_SLIN) {
@@ -2185,7 +2185,7 @@ SWITCH_STANDARD_API(oz_function)
                        stream->write_function(stream, "-ERR Usage: oz dump <span_id> [<chan_id>]\n");
                        goto end;
                } else {
-                       int32_t span_id, chan_id = 0;
+                       uint32_t span_id, chan_id = 0;
                        zap_span_t *span;
 
                        span_id = atoi(argv[1]);
@@ -2204,7 +2204,7 @@ SWITCH_STANDARD_API(oz_function)
                                                dump_chan(span, chan_id, stream);
                                        }
                                } else {
-                                       int j;
+                                       uint32_t j;
                                        
                                        stream->write_function(stream, "+OK\n");
                                        for (j = 1; j <= span->chan_count; j++) {
@@ -2271,7 +2271,7 @@ SWITCH_STANDARD_API(oz_function)
                                if (chan_id) {
                                        zap_log(ZAP_LOG_INFO,"Bounce span: %d, chan: %d\n", span_id, chan_id);
                                } else {
-                                       int j;
+                                       uint32_t j;
                                        
                                        stream->write_function(stream, "+OK\n");
                                        for (j = 1; j <= span->chan_count; j++) {
diff --git a/libs/openzap/msvc/openzap.2005.vcproj b/libs/openzap/msvc/openzap.2005.vcproj
new file mode 100644 (file)
index 0000000..d02a4ad
--- /dev/null
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="openzap"\r
+       ProjectGUID="{93B8812C-3EC4-4F78-8970-FFBFC99E167D}"\r
+       RootNamespace="openzap"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="4"\r
+                       CharacterSet="2"\r
+                       BuildLogFile="$(IntDir)\BuildLog-openzap.htm"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../src/include;../src/isdn/include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               DisableLanguageExtensions="false"\r
+                               RuntimeTypeInfo="false"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="4"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       BuildLogFile="$(IntDir)\BuildLog-openzap.htm"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="../src/include;../src/isdn/include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"\r
+                               RuntimeLibrary="2"\r
+                               DisableLanguageExtensions="false"\r
+                               RuntimeTypeInfo="false"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\src\fsk.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\g711.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\hashtable.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\hashtable_itr.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\libteletone_detect.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\libteletone_generate.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\uart.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\zap_buffer.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\zap_callerid.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\zap_config.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\zap_dso.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\zap_io.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\zap_threadmutex.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\src\include\fsk.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\g711.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\hashtable.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\hashtable_itr.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\hashtable_private.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\libteletone.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\libteletone_detect.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\libteletone_generate.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\openzap.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\uart.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\zap_buffer.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\zap_config.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\zap_dso.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\zap_threadmutex.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\zap_types.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/libs/openzap/msvc/openzap.2008.vcproj b/libs/openzap/msvc/openzap.2008.vcproj
new file mode 100644 (file)
index 0000000..a0d6c2b
--- /dev/null
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="openzap"\r
+       ProjectGUID="{93B8812C-3EC4-4F78-8970-FFBFC99E167D}"\r
+       RootNamespace="openzap"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="4"\r
+                       CharacterSet="2"\r
+                       BuildLogFile="$(IntDir)\BuildLog-openzap.htm"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../src/include;../src/isdn/include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               DisableLanguageExtensions="false"\r
+                               RuntimeTypeInfo="false"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="4"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       BuildLogFile="$(IntDir)\BuildLog-openzap.htm"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="../src/include;../src/isdn/include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"\r
+                               RuntimeLibrary="2"\r
+                               DisableLanguageExtensions="false"\r
+                               RuntimeTypeInfo="false"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\src\include\fsk.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\g711.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\hashtable.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\hashtable_itr.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\hashtable_private.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\libteletone.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\libteletone_detect.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\libteletone_generate.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\openzap.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\uart.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\zap_buffer.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\zap_config.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\zap_dso.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\zap_threadmutex.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\include\zap_types.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\src\fsk.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\g711.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\hashtable.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\hashtable_itr.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\libteletone_detect.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\libteletone_generate.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\uart.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\zap_buffer.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\zap_callerid.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\zap_config.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\zap_dso.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\zap_io.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\src\zap_threadmutex.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/libs/openzap/msvc/openzap.vcproj b/libs/openzap/msvc/openzap.vcproj
deleted file mode 100644 (file)
index c3af236..0000000
+++ /dev/null
@@ -1,557 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8.00"\r
-       Name="openzap"\r
-       ProjectGUID="{93B8812C-3EC4-4F78-8970-FFBFC99E167D}"\r
-       RootNamespace="openzap"\r
-       Keyword="Win32Proj"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="2"\r
-                       BuildLogFile="$(IntDir)\BuildLog-openzap.htm"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="../src/include;../src/isdn/include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               DisableLanguageExtensions="false"\r
-                               RuntimeTypeInfo="false"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="4"\r
-                               CompileAs="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="1"\r
-                       BuildLogFile="$(IntDir)\BuildLog-openzap.htm"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../src/include;../src/isdn/include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"\r
-                               RuntimeLibrary="2"\r
-                               DisableLanguageExtensions="false"\r
-                               RuntimeTypeInfo="false"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                               CompileAs="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Signaling"\r
-                       >\r
-                       <Filter\r
-                               Name="isdn"\r
-                               >\r
-                               <Filter\r
-                                       Name="Header Files"\r
-                                       >\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\include\5ESS.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\include\DMS.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\include\mfifo.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\include\national.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\include\Q921.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\include\Q931.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\include\Q931ie.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\include\Q932.h"\r
-                                               >\r
-                                       </File>\r
-                               </Filter>\r
-                               <Filter\r
-                                       Name="Source Files"\r
-                                       >\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\5ESSmes.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\5ESSStateNT.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\5ESSStateTE.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\DMSmes.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\DMSStateNT.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\DMSStateTE.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\EuroISDNStateNT.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\EuroISDNStateTE.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\mfifo.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\nationalmes.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\nationalStateNT.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\nationalStateTE.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\Q921.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\Q931.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\Q931api.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\Q931ie.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\Q931mes.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\Q931StateNT.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\Q931StateTE.c"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\src\isdn\Q932mes.c"\r
-                                               >\r
-                                       </File>\r
-                               </Filter>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Source Files"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\src\zap_analog.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\zap_isdn.c"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Header Files"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\src\include\zap_analog.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\zap_isdn.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Hardware"\r
-                       >\r
-                       <Filter\r
-                               Name="Header Files"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\src\include\sangoma_tdm_api.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\zap_pika.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\zap_skel.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\zap_wanpipe.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\zap_zt.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Source Files"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\src\zap_pika.c"\r
-                                       >\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32"\r
-                                               ExcludedFromBuild="true"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       AdditionalIncludeDirectories="&quot;c:\Program Files\PIKA\AoH\inc&quot;"\r
-                                                       DisableSpecificWarnings="4214"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32"\r
-                                               ExcludedFromBuild="true"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       AdditionalIncludeDirectories="&quot;c:\Program Files\PIKA\AoH\inc&quot;"\r
-                                                       DisableSpecificWarnings="4214"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\zap_skel.c"\r
-                                       >\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32"\r
-                                               ExcludedFromBuild="true"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32"\r
-                                               ExcludedFromBuild="true"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\zap_wanpipe.c"\r
-                                       >\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32"\r
-                                               ExcludedFromBuild="true"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       AdditionalIncludeDirectories="..\..\AFT_beta_6_0_2_5\include\api;..\..\AFT_beta_6_0_2_5\include\pnp"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32"\r
-                                               ExcludedFromBuild="true"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       AdditionalIncludeDirectories="..\..\AFT_beta_6_0_2_5\include\api;..\..\AFT_beta_6_0_2_5\include\pnp"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\zap_zt.c"\r
-                                       >\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32"\r
-                                               ExcludedFromBuild="true"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32"\r
-                                               ExcludedFromBuild="true"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                       </Filter>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Core"\r
-                       >\r
-                       <Filter\r
-                               Name="Source Files"\r
-                               Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                               UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\src\fsk.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\g711.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\hashtable.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\hashtable_itr.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\libteletone_detect.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\libteletone_generate.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\uart.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\zap_buffer.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\zap_callerid.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\zap_config.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\zap_dso.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\zap_io.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\zap_threadmutex.c"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Header Files"\r
-                               Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                               UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\src\include\fsk.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\g711.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\hashtable.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\hashtable_itr.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\hashtable_private.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\libteletone.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\libteletone_detect.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\libteletone_generate.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\openzap.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\uart.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\zap_buffer.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\zap_config.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\zap_dso.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\zap_threadmutex.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\include\zap_types.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
diff --git a/libs/openzap/msvc/testanalog/testanalog.2008.vcproj b/libs/openzap/msvc/testanalog/testanalog.2008.vcproj
new file mode 100644 (file)
index 0000000..7400deb
--- /dev/null
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="testanalog"\r
+       ProjectGUID="{BB833648-BAFF-4BE2-94DB-F8BB043C588C}"\r
+       RootNamespace="testanalog"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="1"\r
+                       BuildLogFile="$(IntDir)\BuildLog-testanalog.htm"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../src/include;../../src/isdn/include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
+                       BuildLogFile="$(IntDir)\BuildLog-testanalog.htm"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="../../src/include;../../src/isdn/include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\testanalog.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/libs/openzap/msvc/testisdn/testisdn.2008.vcproj b/libs/openzap/msvc/testisdn/testisdn.2008.vcproj
new file mode 100644 (file)
index 0000000..32893d6
--- /dev/null
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="testisdn"\r
+       ProjectGUID="{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}"\r
+       RootNamespace="testisdn"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="1"\r
+                       BuildLogFile="$(IntDir)\BuildLog-testisdn.htm"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../src/include;../../src/isdn/include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
+                       BuildLogFile="$(IntDir)\BuildLog-testisdn.htm"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="../../src/include;../../src/isdn/include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="4"\r
+                               WarnAsError="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\testisdn.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
similarity index 79%
rename from libs/openzap/openzap.sln
rename to libs/openzap/openzap.2005.sln
index 2e05fb41363832d6a88a0a1afc9f3e0220d12b17..5c34eb2878af089aade8854674473503c3256649 100644 (file)
@@ -1,25 +1,19 @@
 ï»¿\r
 Microsoft Visual Studio Solution File, Format Version 9.00\r
 # Visual Studio 2005\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openzap", "msvc\openzap.vcproj", "{93B8812C-3EC4-4F78-8970-FFBFC99E167D}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openzap", "msvc\openzap.2005.vcproj", "{93B8812C-3EC4-4F78-8970-FFBFC99E167D}"\r
 EndProject\r
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unix Makefiles", "Unix Makefiles", "{214C60D6-6E30-4912-B919-DB76A20CC682}"\r
-       ProjectSection(SolutionItems) = preProject\r
-               general.makefile = general.makefile\r
-               Makefile = Makefile\r
-       EndProjectSection\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testanalog", "msvc\testanalog\testanalog.vcproj", "{BB833648-BAFF-4BE2-94DB-F8BB043C588C}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testanalog", "msvc\testanalog\testanalog.2005.vcproj", "{BB833648-BAFF-4BE2-94DB-F8BB043C588C}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testisdn", "msvc\testisdn\testisdn.vcproj", "{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testisdn", "msvc\testisdn\testisdn.2005.vcproj", "{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_openzap", "mod_openzap\mod_openzap.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_openzap", "mod_openzap\mod_openzap.2005.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}\r
        EndProjectSection\r
diff --git a/libs/openzap/openzap.2008.sln b/libs/openzap/openzap.2008.sln
new file mode 100644 (file)
index 0000000..aaeda35
--- /dev/null
@@ -0,0 +1,47 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 10.00\r
+# Visual Studio 2008\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openzap", "msvc\openzap.2008.vcproj", "{93B8812C-3EC4-4F78-8970-FFBFC99E167D}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testanalog", "msvc\testanalog\testanalog.2008.vcproj", "{BB833648-BAFF-4BE2-94DB-F8BB043C588C}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testisdn", "msvc\testisdn\testisdn.2008.vcproj", "{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_openzap", "mod_openzap\mod_openzap.2008.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}\r
+       EndProjectSection\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Win32 = Debug|Win32\r
+               Release|Win32 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|Win32.Build.0 = Debug|Win32\r
+               {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|Win32.ActiveCfg = Release|Win32\r
+               {93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|Win32.Build.0 = Release|Win32\r
+               {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|Win32.Build.0 = Debug|Win32\r
+               {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|Win32.ActiveCfg = Release|Win32\r
+               {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|Win32.Build.0 = Release|Win32\r
+               {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Debug|Win32.Build.0 = Debug|Win32\r
+               {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|Win32.ActiveCfg = Release|Win32\r
+               {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|Win32.Build.0 = Release|Win32\r
+               {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.Build.0 = Debug|Win32\r
+               {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.ActiveCfg = Release|Win32\r
+               {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.Build.0 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r
index d9e0a30a9fac06800c0613c4ce234a4ec8c2d571..e1deb8912f4b9deb5b0f669464c0ece5bb45324a 100644 (file)
@@ -268,7 +268,7 @@ struct hashtable_iterator *hashtable_next(struct hashtable_iterator *i)
 {
 
        if (i->e) {
-               if ((i->e = i->e->next)) {
+               if ((i->e = i->e->next) != 0) { 
                        return i;
                } else {
                        i->pos++;
@@ -283,7 +283,7 @@ struct hashtable_iterator *hashtable_next(struct hashtable_iterator *i)
                return NULL;
        }
        
-       if ((i->e = i->h->table[i->pos])) {
+       if ((i->e = i->h->table[i->pos]) != 0) { 
                return i;
        }
 
@@ -307,7 +307,7 @@ void hashtable_this(struct hashtable_iterator *i, const void **key, int *klen, v
                        *key = i->e->k;
                }
                if (klen) {
-                       *klen = strlen(i->e->k);
+                       *klen = (int)strlen(i->e->k);
                }
                if (val) {
                        *val = i->e->v;
index 0a20c214fdbfa59d9a92d1e33077a87dfafc254d..0f329ca3a6621edb218bb5c841e4729a22a032fb 100644 (file)
@@ -17,7 +17,7 @@ struct entry
 };
 
 struct hashtable_iterator {
-       int pos;
+       unsigned int pos;
        struct entry *e;
        struct hashtable *h;
 };
index e35daf15431d2be08fd6f0277dcc8cc05fe165d5..399518ba27e907d67ff48eb788479edf9b2fac17 100644 (file)
                else zap_log(ZAP_LOG_WARNING, "VETO Changing state on %d:%d from %s to %s\n", obj->span_id, obj->chan_id, zap_channel_state2str(st), zap_channel_state2str(s)); \
        }
 
+#ifdef _MSC_VER
+/* The while(0) below throws a conditional expression is constant warning */
+#pragma warning(disable:4127) 
+#endif
 #define zap_set_state_locked_wait(obj, s)                                              \
        do {                                                                            \
                int __safety = 100;                                                     \
index 7667203227534e0370639355c479bc1e06260d7f..0496e09f5c687cc1e072dccc739ee9fc1305515f 100644 (file)
@@ -83,6 +83,9 @@
 #include "Q921priv.h"
 #include "mfifo.h"
 
+#ifdef WIN32
+#pragma warning(disable:4100 4244)
+#endif
 
 /******************************************************************************************************
  * Actual code below this line
@@ -650,7 +653,7 @@ static int Q921LogMesg(L2TRUNK trunk, Q921LogLevel_t level, L2UCHAR received, L2
                        if(tei != link->tei) {
                                APPEND_MSG(pbuf, poffset, pleft, "    CONTENT:\n");
 
-                               len = print_hex(pbuf + poffset, pleft, &pmes[4], size - (trunk->Q921HeaderSpace + 4));
+                               len = print_hex(pbuf + poffset, (int)pleft, &pmes[4], size - (trunk->Q921HeaderSpace + 4));
                                poffset += len;
                                pleft   -= len;
                        }
@@ -775,7 +778,7 @@ static int Q921LogMesg(L2TRUNK trunk, Q921LogLevel_t level, L2UCHAR received, L2
                                else {
                                        APPEND_MSG(pbuf, poffset, pleft, "    ENT ID: %d (%s), MESSAGE CONTENT:\n", pmes[3], type);
 
-                                       len = print_hex(pbuf + poffset, pleft, &pmes[3], size - (trunk->Q921HeaderSpace + 3));
+                                       len = print_hex(pbuf + poffset, (int)pleft, &pmes[3], size - (trunk->Q921HeaderSpace + 3));
                                        poffset += len;
                                        pleft   -= len;
                                }
@@ -822,7 +825,7 @@ static int Q921LogMesg(L2TRUNK trunk, Q921LogLevel_t level, L2UCHAR received, L2
 out:
        buf[sizeof(buf) - 1] = '\0';
 
-       return trunk->Q921LogProc(trunk->PrivateDataLog, level, buf, strlen(buf));
+       return trunk->Q921LogProc(trunk->PrivateDataLog, level, buf, (int)strlen(buf));
 }
 
 /*****************************************************************************
@@ -3108,7 +3111,11 @@ static int Q921TeiSendAssignRequest(L2TRUNK trunk)
        if (!Q921_IS_PTMP_TE(trunk))    /* only ptmp te mode*/
                return 0;
 
-       link->ri = (L2USHORT)(random() % 0xffff);
+#ifndef WIN32
+               link->ri = (L2USHORT)(random() % 0xffff);
+#else
+               link->ri = (L2USHORT)(rand() % 0xffff); //todo
+#endif
 
        /* send TEI assign request */
        res = Q921TeiSend(trunk, Q921_TEI_ID_REQUEST, link->ri, Q921_TEI_BCAST);
index 1051f716ccb03c37f040f1d7a70422415e58dc69..777151d8b9bb391e873d6b942996683aeb65e763 100644 (file)
@@ -164,7 +164,7 @@ zap_size_t zap_buffer_read_loop(zap_buffer_t *buffer, void *data, zap_size_t dat
                }
                buffer->head = buffer->data;
                buffer->used = buffer->actually_used;
-               len = zap_buffer_read(buffer, data + len, datalen - len);
+               len = zap_buffer_read(buffer, (char*)data + len, datalen - len);
                buffer->loops--;
        }
        return len;
index 97c0f87223d903e06c251a3e340d831fc0b53888..967b80a40c3eb3c24f911a46382c7431b54163b2 100644 (file)
@@ -83,7 +83,7 @@ zap_status_t zap_fsk_data_add_checksum(zap_fsk_data_state_t *state)
                check = check + state->buf[i];
        }
 
-       state->checksum = state->buf[state->bpos] = 256 - check;
+       state->checksum = state->buf[state->bpos] = (uint8_t)(256 - check);
        state->bpos++;
 
        state->dlen = state->bpos;
index b1f6bd90c4d29b1f2c0dec029ff9a11b5c57902f..ab622dd7d3ce153f1c3927f88ece2cf9164527e8 100644 (file)
@@ -213,6 +213,7 @@ int zap_config_get_cas_bits(char *strvalue, unsigned char *outbits)
 {
        char cas_bits[5];
        unsigned char bit = 0x8;
+       int x = 0;
        char *double_colon = strchr(strvalue, ':');
        if (!double_colon) {
                zap_log(ZAP_LOG_ERROR, "No CAS bits specified: %s, :xxxx definition expected, where x is 1 or 0\n", double_colon);
@@ -226,7 +227,6 @@ int zap_config_get_cas_bits(char *strvalue, unsigned char *outbits)
                return -1;
        }
        zap_log(ZAP_LOG_DEBUG, "CAS bits specification found: %s\n", cas_bits);
-       int x = 0;
        for (; cas_bits[x]; x++) {
                if ('1' == cas_bits[x]) {
                        *outbits |= bit;
index 07c25f29fd97470614b852a6641f98fa632e0e52..ead40e7c4b1b466188b5fc719d537976277421c2 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef WIN32
+#include <windows.h>
+#include <stdio.h>
+
+
+void zap_dso_destroy(zap_dso_lib_t *lib) {
+       if (lib && *lib) {
+               FreeLibrary(*lib);
+               *lib = NULL;
+       }
+}
+
+zap_dso_lib_t zap_dso_open(const char *path, char **err) {
+    HINSTANCE lib;
+       
+       lib = LoadLibraryEx(path, NULL, 0);
+
+       if (!lib) {
+               LoadLibraryEx(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+       }
+
+       if (!lib) {
+               DWORD error = GetLastError();
+               char tmp[80];
+               sprintf(tmp, "dll open error [%ul]\n", error);
+               *err = _strdup(tmp);
+       }
+
+       return lib;
+}
+
+void* zap_dso_func_sym(zap_dso_lib_t lib, const char *sym, char **err) {
+       FARPROC func = GetProcAddress(lib, sym);
+       if (!func) {
+               DWORD error = GetLastError();
+               char tmp[80];
+               sprintf(tmp, "dll sym error [%ul]\n", error);
+               *err = _strdup(tmp);
+       }
+       return (void *)(intptr_t)func; // this should really be addr - zap_dso_func_data
+}
+
+#else
+
 /*
 ** {========================================================================
 ** This is an implementation of loadlib based on the dlfcn interface.
@@ -55,6 +99,7 @@ void *zap_dso_func_sym(zap_dso_lib_t lib, const char *sym, char **err) {
        }
        return func;
 }
+#endif
 
 /* }====================================================== */
 
index 0f6bf94bf5e7b41c934ad4e3075d2b8bae86b0cd..88d800a47fdf9f4faa7e3163fa526af5d20011b9 100644 (file)
@@ -1707,7 +1707,7 @@ zap_status_t zap_channel_queue_dtmf(zap_channel_t *zchan, const char *dtmf)
 static zap_status_t handle_dtmf(zap_channel_t *zchan, zap_size_t datalen)
 {
        zap_buffer_t *buffer = NULL;
-       zap_size_t dblen;
+       zap_size_t dblen = 0;
 
        if (zchan->gen_dtmf_buffer && (dblen = zap_buffer_inuse(zchan->gen_dtmf_buffer))) {
                char digits[128] = "";
@@ -2362,6 +2362,7 @@ int zap_load_module(const char *name)
 #ifdef WIN32
     const char *ext = ".dll";
     //const char *EXT = ".DLL";
+#define ZAP_MOD_DIR "." //todo
 #elif defined (MACOSX) || defined (DARWIN)
     const char *ext = ".dylib";
     //const char *EXT = ".DYLIB";
@@ -2389,18 +2390,18 @@ int zap_load_module(const char *name)
        }
 
        if (mod->io_load) {
-               zap_io_interface_t *interface = NULL;
+               zap_io_interface_t *interface1 = NULL; /* name conflict w/windows here */
 
-               if (mod->io_load(&interface) != ZAP_SUCCESS || !interface || !interface->name) {
+               if (mod->io_load(&interface1) != ZAP_SUCCESS || !interface1 || !interface1->name) {
                        zap_log(ZAP_LOG_ERROR, "Error loading %s\n", path);
                } else {
-                       zap_log(ZAP_LOG_INFO, "Loading IO from %s [%s]\n", path, interface->name);
+                       zap_log(ZAP_LOG_INFO, "Loading IO from %s [%s]\n", path, interface1->name);
                        zap_mutex_lock(globals.mutex);
-                       if (hashtable_search(globals.interface_hash, (void *)interface->name)) {
-                               zap_log(ZAP_LOG_ERROR, "Interface %s already loaded!\n", interface->name);
+                       if (hashtable_search(globals.interface_hash, (void *)interface1->name)) {
+                               zap_log(ZAP_LOG_ERROR, "Interface %s already loaded!\n", interface1->name);
                        } else {
-                               hashtable_insert(globals.interface_hash, (void *)interface->name, interface, HASHTABLE_FLAG_NONE);
-                               process_module_config(interface);
+                               hashtable_insert(globals.interface_hash, (void *)interface1->name, interface1, HASHTABLE_FLAG_NONE);
+                               process_module_config(interface1);
                                x++;
                        }
                        zap_mutex_unlock(globals.mutex);
@@ -2844,6 +2845,42 @@ zap_status_t zap_console_stream_raw_write(zap_stream_handle_t *handle, uint8_t *
        return ZAP_SUCCESS;
 }
 
+int zap_vasprintf(char **ret, const char *fmt, va_list ap) /* code from switch_apr.c */
+{
+#ifdef HAVE_VASPRINTF
+       return vasprintf(ret, fmt, ap);
+#else
+       char *buf;
+       int len;
+       size_t buflen;
+       va_list ap2;
+       char *tmp = NULL;
+
+#ifdef _MSC_VER
+#if _MSC_VER >= 1500
+       /* hack for incorrect assumption in msvc header files for code analysis */
+       __analysis_assume(tmp);
+#endif
+       ap2 = ap;
+#else
+       va_copy(ap2, ap);
+#endif
+
+       len = vsnprintf(tmp, 0, fmt, ap2);
+
+       if (len > 0 && (buf = malloc((buflen = (size_t) (len + 1)))) != NULL) {
+               len = vsnprintf(buf, buflen, fmt, ap);
+               *ret = buf;
+       } else {
+               *ret = NULL;
+               len = -1;
+       }
+
+       va_end(ap2);
+       return len;
+#endif
+}
+
 zap_status_t zap_console_stream_write(zap_stream_handle_t *handle, const char *fmt, ...)
 {
        va_list ap;
@@ -2857,7 +2894,7 @@ zap_status_t zap_console_stream_write(zap_stream_handle_t *handle, const char *f
        }
 
        va_start(ap, fmt);
-       ret = vasprintf(&data, fmt, ap);
+       ret = zap_vasprintf(&data, fmt, ap);
        va_end(ap);
 
        if (data) {