<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][17451] </title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=17451">17451</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-04-29 09:53:03 -0500 (Thu, 29 Apr 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>freetdm: windows fixes</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmfreetdm2008sln">freeswitch/trunk/libs/freetdm/freetdm.2008.sln</a></li>
<li><a href="#freeswitchtrunklibsfreetdmmod_freetdmmod_freetdmc">freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmmsvcfreetdm2008vcproj">freeswitch/trunk/libs/freetdm/msvc/freetdm.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_isdnftmod_isdnc">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_wanpipeftmod_wanpipe2008vcproj">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludefreetdmh">freeswitch/trunk/libs/freetdm/src/include/freetdm.h</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeftdm_declareh">freeswitch/trunk/libs/freetdm/src/include/ftdm_declare.h</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeftdm_osh">freeswitch/trunk/libs/freetdm/src/include/ftdm_os.h</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeprivateftdm_coreh">freeswitch/trunk/libs/freetdm/src/include/private/ftdm_core.h</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrctestanalogc">freeswitch/trunk/libs/freetdm/src/testanalog.c</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmfreetdm2008sln"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/freetdm.2008.sln (17450 => 17451)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/freetdm.2008.sln        2010-04-29 13:34:53 UTC (rev 17450)
+++ freeswitch/trunk/libs/freetdm/freetdm.2008.sln        2010-04-29 14:53:03 UTC (rev 17451)
</span><span class="lines">@@ -73,7 +73,6 @@
</span><span class="cx">                 {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx">                 {BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|Win32.Build.0 = Release|Win32
</span><span class="cx">                 {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Debug|Win32.ActiveCfg = Debug|Win32
</span><del>-                {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Debug|Win32.Build.0 = Debug|Win32
</del><span class="cx">                 {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx">                 {6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|Win32.Build.0 = Release|Win32
</span><span class="cx">                 {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="lines">@@ -89,7 +88,6 @@
</span><span class="cx">                 {B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx">                 {B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|Win32.Build.0 = Release|Win32
</span><span class="cx">                 {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Debug|Win32.ActiveCfg = Debug|Win32
</span><del>-                {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Debug|Win32.Build.0 = Debug|Win32
</del><span class="cx">                 {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx">                 {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|Win32.Build.0 = Release|Win32
</span><span class="cx">                 {E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Debug|Win32.ActiveCfg = Debug|Win32
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmmod_freetdmmod_freetdmc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c (17450 => 17451)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c        2010-04-29 13:34:53 UTC (rev 17450)
+++ freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c        2010-04-29 14:53:03 UTC (rev 17451)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx">         switch_core_session_t *session;
</span><span class="cx">         switch_channel_t *channel;
</span><span class="cx">         private_t *tech_pvt;
</span><del>-        int32_t tokencnt = ftdm_channel_get_token_count(ftdmchan);
</del><ins>+        uint32_t tokencnt = ftdm_channel_get_token_count(ftdmchan);
</ins><span class="cx">         
</span><span class="cx"> 
</span><span class="cx">         for (i = 0; i &lt; tokencnt; i++) {
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmmsvcfreetdm2008vcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/msvc/freetdm.2008.vcproj (17450 => 17451)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/msvc/freetdm.2008.vcproj        2010-04-29 13:34:53 UTC (rev 17450)
+++ freeswitch/trunk/libs/freetdm/msvc/freetdm.2008.vcproj        2010-04-29 14:53:03 UTC (rev 17451)
</span><span class="lines">@@ -1,459 +1,471 @@
</span><del>-&lt;?xml version=&quot;1.0&quot; encoding=&quot;Windows-1252&quot;?&gt;
-&lt;VisualStudioProject
-        ProjectType=&quot;Visual C++&quot;
-        Version=&quot;9.00&quot;
-        Name=&quot;freetdm&quot;
-        ProjectGUID=&quot;{93B8812C-3EC4-4F78-8970-FFBFC99E167D}&quot;
-        RootNamespace=&quot;freetdm&quot;
-        Keyword=&quot;Win32Proj&quot;
-        TargetFrameworkVersion=&quot;131072&quot;
-        &gt;
-        &lt;Platforms&gt;
-                &lt;Platform
-                        Name=&quot;Win32&quot;
-                /&gt;
-                &lt;Platform
-                        Name=&quot;x64&quot;
-                /&gt;
-        &lt;/Platforms&gt;
-        &lt;ToolFiles&gt;
-        &lt;/ToolFiles&gt;
-        &lt;Configurations&gt;
-                &lt;Configuration
-                        Name=&quot;Debug|Win32&quot;
-                        OutputDirectory=&quot;$(SolutionDir)$(ConfigurationName)&quot;
-                        IntermediateDirectory=&quot;$(ConfigurationName)&quot;
-                        ConfigurationType=&quot;2&quot;
-                        CharacterSet=&quot;2&quot;
-                        BuildLogFile=&quot;$(IntDir)\BuildLog-freetdm.htm&quot;
-                        &gt;
-                        &lt;Tool
-                                Name=&quot;VCPreBuildEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCustomBuildTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXMLDataGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCMIDLTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCLCompilerTool&quot;
-                                Optimization=&quot;0&quot;
-                                AdditionalIncludeDirectories=&quot;../src/include;../src/isdn/include&quot;
-                                PreprocessorDefinitions=&quot;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS&quot;
-                                MinimalRebuild=&quot;true&quot;
-                                BasicRuntimeChecks=&quot;3&quot;
-                                RuntimeLibrary=&quot;3&quot;
-                                DisableLanguageExtensions=&quot;false&quot;
-                                RuntimeTypeInfo=&quot;false&quot;
-                                UsePrecompiledHeader=&quot;0&quot;
-                                WarningLevel=&quot;4&quot;
-                                WarnAsError=&quot;true&quot;
-                                Detect64BitPortabilityProblems=&quot;false&quot;
-                                DebugInformationFormat=&quot;3&quot;
-                                CompileAs=&quot;1&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManagedResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPreLinkEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCLinkerTool&quot;
-                                GenerateDebugInformation=&quot;true&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCALinkTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManifestTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXDCMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCBscMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCFxCopTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCAppVerifierTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPostBuildEventTool&quot;
-                        /&gt;
-                &lt;/Configuration&gt;
-                &lt;Configuration
-                        Name=&quot;Release|Win32&quot;
-                        OutputDirectory=&quot;$(SolutionDir)$(ConfigurationName)&quot;
-                        IntermediateDirectory=&quot;$(ConfigurationName)&quot;
-                        ConfigurationType=&quot;2&quot;
-                        CharacterSet=&quot;2&quot;
-                        WholeProgramOptimization=&quot;1&quot;
-                        BuildLogFile=&quot;$(IntDir)\BuildLog-freetdm.htm&quot;
-                        &gt;
-                        &lt;Tool
-                                Name=&quot;VCPreBuildEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCustomBuildTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXMLDataGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCMIDLTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCLCompilerTool&quot;
-                                AdditionalIncludeDirectories=&quot;../src/include;../src/isdn/include&quot;
-                                PreprocessorDefinitions=&quot;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS&quot;
-                                RuntimeLibrary=&quot;2&quot;
-                                DisableLanguageExtensions=&quot;false&quot;
-                                RuntimeTypeInfo=&quot;false&quot;
-                                UsePrecompiledHeader=&quot;0&quot;
-                                WarningLevel=&quot;4&quot;
-                                WarnAsError=&quot;true&quot;
-                                Detect64BitPortabilityProblems=&quot;false&quot;
-                                DebugInformationFormat=&quot;3&quot;
-                                CompileAs=&quot;1&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManagedResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPreLinkEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCLinkerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCALinkTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManifestTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXDCMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCBscMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCFxCopTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCAppVerifierTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPostBuildEventTool&quot;
-                        /&gt;
-                &lt;/Configuration&gt;
-                &lt;Configuration
-                        Name=&quot;Debug|x64&quot;
-                        OutputDirectory=&quot;$(SolutionDir)$(PlatformName)\$(ConfigurationName)&quot;
-                        IntermediateDirectory=&quot;$(PlatformName)\$(ConfigurationName)&quot;
-                        ConfigurationType=&quot;2&quot;
-                        CharacterSet=&quot;2&quot;
-                        BuildLogFile=&quot;$(IntDir)\BuildLog-freetdm.htm&quot;
-                        &gt;
-                        &lt;Tool
-                                Name=&quot;VCPreBuildEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCustomBuildTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXMLDataGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCMIDLTool&quot;
-                                TargetEnvironment=&quot;3&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCLCompilerTool&quot;
-                                Optimization=&quot;0&quot;
-                                AdditionalIncludeDirectories=&quot;../src/include;../src/isdn/include&quot;
-                                PreprocessorDefinitions=&quot;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS&quot;
-                                MinimalRebuild=&quot;true&quot;
-                                BasicRuntimeChecks=&quot;3&quot;
-                                RuntimeLibrary=&quot;3&quot;
-                                DisableLanguageExtensions=&quot;false&quot;
-                                RuntimeTypeInfo=&quot;false&quot;
-                                UsePrecompiledHeader=&quot;0&quot;
-                                WarningLevel=&quot;4&quot;
-                                WarnAsError=&quot;true&quot;
-                                Detect64BitPortabilityProblems=&quot;false&quot;
-                                DebugInformationFormat=&quot;3&quot;
-                                CompileAs=&quot;1&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManagedResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPreLinkEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCLinkerTool&quot;
-                                GenerateDebugInformation=&quot;true&quot;
-                                TargetMachine=&quot;17&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCALinkTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManifestTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXDCMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCBscMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCFxCopTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCAppVerifierTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPostBuildEventTool&quot;
-                        /&gt;
-                &lt;/Configuration&gt;
-                &lt;Configuration
-                        Name=&quot;Release|x64&quot;
-                        OutputDirectory=&quot;$(SolutionDir)$(PlatformName)\$(ConfigurationName)&quot;
-                        IntermediateDirectory=&quot;$(PlatformName)\$(ConfigurationName)&quot;
-                        ConfigurationType=&quot;2&quot;
-                        CharacterSet=&quot;2&quot;
-                        WholeProgramOptimization=&quot;1&quot;
-                        BuildLogFile=&quot;$(IntDir)\BuildLog-freetdm.htm&quot;
-                        &gt;
-                        &lt;Tool
-                                Name=&quot;VCPreBuildEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCustomBuildTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXMLDataGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCMIDLTool&quot;
-                                TargetEnvironment=&quot;3&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCLCompilerTool&quot;
-                                AdditionalIncludeDirectories=&quot;../src/include;../src/isdn/include&quot;
-                                PreprocessorDefinitions=&quot;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS&quot;
-                                RuntimeLibrary=&quot;2&quot;
-                                DisableLanguageExtensions=&quot;false&quot;
-                                RuntimeTypeInfo=&quot;false&quot;
-                                UsePrecompiledHeader=&quot;0&quot;
-                                WarningLevel=&quot;4&quot;
-                                WarnAsError=&quot;true&quot;
-                                Detect64BitPortabilityProblems=&quot;false&quot;
-                                DebugInformationFormat=&quot;3&quot;
-                                CompileAs=&quot;1&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManagedResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPreLinkEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCLinkerTool&quot;
-                                TargetMachine=&quot;17&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCALinkTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManifestTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXDCMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCBscMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCFxCopTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCAppVerifierTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPostBuildEventTool&quot;
-                        /&gt;
-                &lt;/Configuration&gt;
-        &lt;/Configurations&gt;
-        &lt;References&gt;
-        &lt;/References&gt;
-        &lt;Files&gt;
-                &lt;Filter
-                        Name=&quot;Header Files&quot;
-                        Filter=&quot;h;hpp;hxx;hm;inl;inc;xsd&quot;
-                        UniqueIdentifier=&quot;{93995380-89BD-4b04-88EB-625FBE52EBFB}&quot;
-                        &gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\freetdm.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\fsk.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\ftdm_buffer.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\ftdm_config.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\ftdm_dso.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\ftdm_threadmutex.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\ftdm_types.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\g711.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\hashtable.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\hashtable_itr.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\hashtable_private.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\libteletone.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\libteletone_detect.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\libteletone_generate.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\include\uart.h&quot;
-                                &gt;
-                        &lt;/File&gt;
-                &lt;/Filter&gt;
-                &lt;Filter
-                        Name=&quot;Source Files&quot;
-                        Filter=&quot;cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx&quot;
-                        UniqueIdentifier=&quot;{4FC737F1-C7A5-4376-A066-2A32D752A2FF}&quot;
-                        &gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\fsk.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\ftdm_buffer.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\ftdm_callerid.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\ftdm_config.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\ftdm_cpu_monitor.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\ftdm_dso.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\ftdm_io.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\ftdm_queue.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\ftdm_threadmutex.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\g711.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\hashtable.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\hashtable_itr.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\libteletone_detect.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\libteletone_generate.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                        &lt;File
-                                RelativePath=&quot;..\src\uart.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                &lt;/Filter&gt;
-        &lt;/Files&gt;
-        &lt;Globals&gt;
-        &lt;/Globals&gt;
-&lt;/VisualStudioProject&gt;
</del><ins>+&lt;?xml version=&quot;1.0&quot; encoding=&quot;Windows-1252&quot;?&gt;
+&lt;VisualStudioProject
+        ProjectType=&quot;Visual C++&quot;
+        Version=&quot;9.00&quot;
+        Name=&quot;freetdm&quot;
+        ProjectGUID=&quot;{93B8812C-3EC4-4F78-8970-FFBFC99E167D}&quot;
+        RootNamespace=&quot;freetdm&quot;
+        Keyword=&quot;Win32Proj&quot;
+        TargetFrameworkVersion=&quot;131072&quot;
+        &gt;
+        &lt;Platforms&gt;
+                &lt;Platform
+                        Name=&quot;Win32&quot;
+                /&gt;
+                &lt;Platform
+                        Name=&quot;x64&quot;
+                /&gt;
+        &lt;/Platforms&gt;
+        &lt;ToolFiles&gt;
+        &lt;/ToolFiles&gt;
+        &lt;Configurations&gt;
+                &lt;Configuration
+                        Name=&quot;Debug|Win32&quot;
+                        OutputDirectory=&quot;$(SolutionDir)$(ConfigurationName)&quot;
+                        IntermediateDirectory=&quot;$(ConfigurationName)&quot;
+                        ConfigurationType=&quot;2&quot;
+                        CharacterSet=&quot;2&quot;
+                        BuildLogFile=&quot;$(IntDir)\BuildLog-freetdm.htm&quot;
+                        &gt;
+                        &lt;Tool
+                                Name=&quot;VCPreBuildEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCustomBuildTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXMLDataGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCMIDLTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCLCompilerTool&quot;
+                                Optimization=&quot;0&quot;
+                                AdditionalIncludeDirectories=&quot;../src/include;../src/include/private;../src/isdn/include&quot;
+                                PreprocessorDefinitions=&quot;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS&quot;
+                                MinimalRebuild=&quot;true&quot;
+                                BasicRuntimeChecks=&quot;3&quot;
+                                RuntimeLibrary=&quot;3&quot;
+                                DisableLanguageExtensions=&quot;false&quot;
+                                RuntimeTypeInfo=&quot;false&quot;
+                                UsePrecompiledHeader=&quot;0&quot;
+                                WarningLevel=&quot;4&quot;
+                                WarnAsError=&quot;true&quot;
+                                Detect64BitPortabilityProblems=&quot;false&quot;
+                                DebugInformationFormat=&quot;3&quot;
+                                CompileAs=&quot;1&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManagedResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPreLinkEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCLinkerTool&quot;
+                                GenerateDebugInformation=&quot;true&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCALinkTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManifestTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXDCMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCBscMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCFxCopTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCAppVerifierTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPostBuildEventTool&quot;
+                        /&gt;
+                &lt;/Configuration&gt;
+                &lt;Configuration
+                        Name=&quot;Release|Win32&quot;
+                        OutputDirectory=&quot;$(SolutionDir)$(ConfigurationName)&quot;
+                        IntermediateDirectory=&quot;$(ConfigurationName)&quot;
+                        ConfigurationType=&quot;2&quot;
+                        CharacterSet=&quot;2&quot;
+                        WholeProgramOptimization=&quot;1&quot;
+                        BuildLogFile=&quot;$(IntDir)\BuildLog-freetdm.htm&quot;
+                        &gt;
+                        &lt;Tool
+                                Name=&quot;VCPreBuildEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCustomBuildTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXMLDataGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCMIDLTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCLCompilerTool&quot;
+                                AdditionalIncludeDirectories=&quot;../src/include;../src/isdn/include&quot;
+                                PreprocessorDefinitions=&quot;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS&quot;
+                                RuntimeLibrary=&quot;2&quot;
+                                DisableLanguageExtensions=&quot;false&quot;
+                                RuntimeTypeInfo=&quot;false&quot;
+                                UsePrecompiledHeader=&quot;0&quot;
+                                WarningLevel=&quot;4&quot;
+                                WarnAsError=&quot;true&quot;
+                                Detect64BitPortabilityProblems=&quot;false&quot;
+                                DebugInformationFormat=&quot;3&quot;
+                                CompileAs=&quot;1&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManagedResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPreLinkEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCLinkerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCALinkTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManifestTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXDCMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCBscMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCFxCopTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCAppVerifierTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPostBuildEventTool&quot;
+                        /&gt;
+                &lt;/Configuration&gt;
+                &lt;Configuration
+                        Name=&quot;Debug|x64&quot;
+                        OutputDirectory=&quot;$(SolutionDir)$(PlatformName)\$(ConfigurationName)&quot;
+                        IntermediateDirectory=&quot;$(PlatformName)\$(ConfigurationName)&quot;
+                        ConfigurationType=&quot;2&quot;
+                        CharacterSet=&quot;2&quot;
+                        BuildLogFile=&quot;$(IntDir)\BuildLog-freetdm.htm&quot;
+                        &gt;
+                        &lt;Tool
+                                Name=&quot;VCPreBuildEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCustomBuildTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXMLDataGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCMIDLTool&quot;
+                                TargetEnvironment=&quot;3&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCLCompilerTool&quot;
+                                Optimization=&quot;0&quot;
+                                AdditionalIncludeDirectories=&quot;../src/include;../src/isdn/include&quot;
+                                PreprocessorDefinitions=&quot;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS&quot;
+                                MinimalRebuild=&quot;true&quot;
+                                BasicRuntimeChecks=&quot;3&quot;
+                                RuntimeLibrary=&quot;3&quot;
+                                DisableLanguageExtensions=&quot;false&quot;
+                                RuntimeTypeInfo=&quot;false&quot;
+                                UsePrecompiledHeader=&quot;0&quot;
+                                WarningLevel=&quot;4&quot;
+                                WarnAsError=&quot;true&quot;
+                                Detect64BitPortabilityProblems=&quot;false&quot;
+                                DebugInformationFormat=&quot;3&quot;
+                                CompileAs=&quot;1&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManagedResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPreLinkEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCLinkerTool&quot;
+                                GenerateDebugInformation=&quot;true&quot;
+                                TargetMachine=&quot;17&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCALinkTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManifestTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXDCMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCBscMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCFxCopTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCAppVerifierTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPostBuildEventTool&quot;
+                        /&gt;
+                &lt;/Configuration&gt;
+                &lt;Configuration
+                        Name=&quot;Release|x64&quot;
+                        OutputDirectory=&quot;$(SolutionDir)$(PlatformName)\$(ConfigurationName)&quot;
+                        IntermediateDirectory=&quot;$(PlatformName)\$(ConfigurationName)&quot;
+                        ConfigurationType=&quot;2&quot;
+                        CharacterSet=&quot;2&quot;
+                        WholeProgramOptimization=&quot;1&quot;
+                        BuildLogFile=&quot;$(IntDir)\BuildLog-freetdm.htm&quot;
+                        &gt;
+                        &lt;Tool
+                                Name=&quot;VCPreBuildEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCustomBuildTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXMLDataGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCMIDLTool&quot;
+                                TargetEnvironment=&quot;3&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCLCompilerTool&quot;
+                                AdditionalIncludeDirectories=&quot;../src/include;../src/isdn/include&quot;
+                                PreprocessorDefinitions=&quot;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS&quot;
+                                RuntimeLibrary=&quot;2&quot;
+                                DisableLanguageExtensions=&quot;false&quot;
+                                RuntimeTypeInfo=&quot;false&quot;
+                                UsePrecompiledHeader=&quot;0&quot;
+                                WarningLevel=&quot;4&quot;
+                                WarnAsError=&quot;true&quot;
+                                Detect64BitPortabilityProblems=&quot;false&quot;
+                                DebugInformationFormat=&quot;3&quot;
+                                CompileAs=&quot;1&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManagedResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPreLinkEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCLinkerTool&quot;
+                                TargetMachine=&quot;17&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCALinkTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManifestTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXDCMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCBscMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCFxCopTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCAppVerifierTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPostBuildEventTool&quot;
+                        /&gt;
+                &lt;/Configuration&gt;
+        &lt;/Configurations&gt;
+        &lt;References&gt;
+        &lt;/References&gt;
+        &lt;Files&gt;
+                &lt;Filter
+                        Name=&quot;Header Files&quot;
+                        Filter=&quot;h;hpp;hxx;hm;inl;inc;xsd&quot;
+                        UniqueIdentifier=&quot;{93995380-89BD-4b04-88EB-625FBE52EBFB}&quot;
+                        &gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\freetdm.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\private\fsk.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\private\ftdm_buffer.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\private\ftdm_config.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\private\ftdm_core.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\ftdm_declare.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\private\ftdm_dso.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\ftdm_os.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\ftdm_threadmutex.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\private\ftdm_types.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\private\g711.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\private\hashtable.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\private\hashtable_itr.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\private\hashtable_private.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\private\libteletone.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\private\libteletone_detect.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\private\libteletone_generate.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\include\private\uart.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                &lt;/Filter&gt;
+                &lt;Filter
+                        Name=&quot;Source Files&quot;
+                        Filter=&quot;cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx&quot;
+                        UniqueIdentifier=&quot;{4FC737F1-C7A5-4376-A066-2A32D752A2FF}&quot;
+                        &gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\fsk.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\ftdm_buffer.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\ftdm_callerid.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\ftdm_config.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\ftdm_cpu_monitor.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\ftdm_dso.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\ftdm_io.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\ftdm_queue.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\ftdm_threadmutex.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\g711.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\hashtable.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\hashtable_itr.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\libteletone_detect.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\libteletone_generate.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
+                                RelativePath=&quot;..\src\uart.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                &lt;/Filter&gt;
+        &lt;/Files&gt;
+        &lt;Globals&gt;
+        &lt;/Globals&gt;
+&lt;/VisualStudioProject&gt;
</ins></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_isdnftmod_isdnc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c (17450 => 17451)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c        2010-04-29 13:34:53 UTC (rev 17450)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c        2010-04-29 14:53:03 UTC (rev 17451)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #define __EXTENSIONS__
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#include &quot;freetdm.h&quot;
</del><ins>+#include &quot;private/ftdm_core.h&quot;
</ins><span class="cx"> #include &quot;Q931.h&quot;
</span><span class="cx"> #include &quot;Q921.h&quot;
</span><span class="cx"> #ifdef WIN32
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_wanpipeftmod_wanpipe2008vcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2008.vcproj (17450 => 17451)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2008.vcproj        2010-04-29 13:34:53 UTC (rev 17450)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2008.vcproj        2010-04-29 14:53:03 UTC (rev 17451)
</span><span class="lines">@@ -1,355 +1,355 @@
</span><del>-&lt;?xml version=&quot;1.0&quot; encoding=&quot;Windows-1252&quot;?&gt;
-&lt;VisualStudioProject
-        ProjectType=&quot;Visual C++&quot;
-        Version=&quot;9.00&quot;
-        Name=&quot;ftmod_wanpipe&quot;
-        ProjectGUID=&quot;{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}&quot;
-        RootNamespace=&quot;ftmod_wanpipe&quot;
-        Keyword=&quot;Win32Proj&quot;
-        TargetFrameworkVersion=&quot;131072&quot;
-        &gt;
-        &lt;Platforms&gt;
-                &lt;Platform
-                        Name=&quot;Win32&quot;
-                /&gt;
-                &lt;Platform
-                        Name=&quot;x64&quot;
-                /&gt;
-        &lt;/Platforms&gt;
-        &lt;ToolFiles&gt;
-        &lt;/ToolFiles&gt;
-        &lt;Configurations&gt;
-                &lt;Configuration
-                        Name=&quot;Debug|Win32&quot;
-                        OutputDirectory=&quot;$(SolutionDir)$(ConfigurationName)&quot;
-                        IntermediateDirectory=&quot;$(ConfigurationName)&quot;
-                        ConfigurationType=&quot;2&quot;
-                        CharacterSet=&quot;2&quot;
-                        &gt;
-                        &lt;Tool
-                                Name=&quot;VCPreBuildEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCustomBuildTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXMLDataGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCMIDLTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCLCompilerTool&quot;
-                                Optimization=&quot;0&quot;
-                                AdditionalIncludeDirectories=&quot;../../../src/include;../../../src/isdn/include;&amp;quot;C:\Program Files\Sangoma\include&amp;quot;&quot;
-                                PreprocessorDefinitions=&quot;WIN32;_DEBUG;_CONSOLE;&quot;
-                                MinimalRebuild=&quot;true&quot;
-                                BasicRuntimeChecks=&quot;3&quot;
-                                RuntimeLibrary=&quot;3&quot;
-                                UsePrecompiledHeader=&quot;0&quot;
-                                WarningLevel=&quot;3&quot;
-                                Detect64BitPortabilityProblems=&quot;true&quot;
-                                DebugInformationFormat=&quot;4&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManagedResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPreLinkEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCLinkerTool&quot;
-                                AdditionalDependencies=&quot;freetdm.lib libsangoma.lib&quot;
-                                LinkIncremental=&quot;2&quot;
-                                AdditionalLibraryDirectories=&quot;&amp;quot;$(OutDir)&amp;quot;;&amp;quot;C:\Program Files\Sangoma\api\lib\x86&amp;quot;&quot;
-                                GenerateDebugInformation=&quot;true&quot;
-                                SubSystem=&quot;1&quot;
-                                RandomizedBaseAddress=&quot;1&quot;
-                                DataExecutionPrevention=&quot;0&quot;
-                                TargetMachine=&quot;1&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCALinkTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManifestTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXDCMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCBscMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCFxCopTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCAppVerifierTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPostBuildEventTool&quot;
-                        /&gt;
-                &lt;/Configuration&gt;
-                &lt;Configuration
-                        Name=&quot;Release|Win32&quot;
-                        OutputDirectory=&quot;$(SolutionDir)$(ConfigurationName)&quot;
-                        IntermediateDirectory=&quot;$(ConfigurationName)&quot;
-                        ConfigurationType=&quot;2&quot;
-                        CharacterSet=&quot;2&quot;
-                        WholeProgramOptimization=&quot;1&quot;
-                        &gt;
-                        &lt;Tool
-                                Name=&quot;VCPreBuildEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCustomBuildTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXMLDataGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCMIDLTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCLCompilerTool&quot;
-                                AdditionalIncludeDirectories=&quot;../../../src/include;../../../src/isdn/include;../../../wanpipe/include&quot;
-                                PreprocessorDefinitions=&quot;WIN32;NDEBUG;_CONSOLE&quot;
-                                RuntimeLibrary=&quot;2&quot;
-                                UsePrecompiledHeader=&quot;0&quot;
-                                WarningLevel=&quot;3&quot;
-                                Detect64BitPortabilityProblems=&quot;true&quot;
-                                DebugInformationFormat=&quot;3&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManagedResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPreLinkEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCLinkerTool&quot;
-                                AdditionalDependencies=&quot;freetdm.lib libsangoma.lib&quot;
-                                LinkIncremental=&quot;1&quot;
-                                AdditionalLibraryDirectories=&quot;&amp;quot;$(OutDir)&amp;quot;;../../../wanpipe/api/lib/x86&quot;
-                                GenerateDebugInformation=&quot;true&quot;
-                                SubSystem=&quot;1&quot;
-                                OptimizeReferences=&quot;2&quot;
-                                EnableCOMDATFolding=&quot;2&quot;
-                                RandomizedBaseAddress=&quot;1&quot;
-                                DataExecutionPrevention=&quot;0&quot;
-                                TargetMachine=&quot;1&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCALinkTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManifestTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXDCMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCBscMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCFxCopTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCAppVerifierTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPostBuildEventTool&quot;
-                        /&gt;
-                &lt;/Configuration&gt;
-                &lt;Configuration
-                        Name=&quot;Debug|x64&quot;
-                        OutputDirectory=&quot;$(SolutionDir)$(PlatformName)\$(ConfigurationName)&quot;
-                        IntermediateDirectory=&quot;$(PlatformName)\$(ConfigurationName)&quot;
-                        ConfigurationType=&quot;2&quot;
-                        CharacterSet=&quot;2&quot;
-                        &gt;
-                        &lt;Tool
-                                Name=&quot;VCPreBuildEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCustomBuildTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXMLDataGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCMIDLTool&quot;
-                                TargetEnvironment=&quot;3&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCLCompilerTool&quot;
-                                Optimization=&quot;0&quot;
-                                AdditionalIncludeDirectories=&quot;../../../src/include;../../../src/isdn/include;../../../wanpipe/include&quot;
-                                PreprocessorDefinitions=&quot;WIN32;_DEBUG;_CONSOLE;&quot;
-                                MinimalRebuild=&quot;true&quot;
-                                BasicRuntimeChecks=&quot;3&quot;
-                                RuntimeLibrary=&quot;3&quot;
-                                UsePrecompiledHeader=&quot;0&quot;
-                                WarningLevel=&quot;3&quot;
-                                Detect64BitPortabilityProblems=&quot;true&quot;
-                                DebugInformationFormat=&quot;3&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManagedResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPreLinkEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCLinkerTool&quot;
-                                AdditionalDependencies=&quot;freetdm.lib libsangoma.lib&quot;
-                                LinkIncremental=&quot;2&quot;
-                                AdditionalLibraryDirectories=&quot;&amp;quot;$(OutDir)&amp;quot;;../../../wanpipe/api/lib/x64&quot;
-                                GenerateDebugInformation=&quot;true&quot;
-                                SubSystem=&quot;1&quot;
-                                RandomizedBaseAddress=&quot;1&quot;
-                                DataExecutionPrevention=&quot;0&quot;
-                                TargetMachine=&quot;17&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCALinkTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManifestTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXDCMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCBscMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCFxCopTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCAppVerifierTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPostBuildEventTool&quot;
-                        /&gt;
-                &lt;/Configuration&gt;
-                &lt;Configuration
-                        Name=&quot;Release|x64&quot;
-                        OutputDirectory=&quot;$(SolutionDir)$(PlatformName)\$(ConfigurationName)&quot;
-                        IntermediateDirectory=&quot;$(PlatformName)\$(ConfigurationName)&quot;
-                        ConfigurationType=&quot;2&quot;
-                        CharacterSet=&quot;2&quot;
-                        WholeProgramOptimization=&quot;1&quot;
-                        &gt;
-                        &lt;Tool
-                                Name=&quot;VCPreBuildEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCustomBuildTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXMLDataGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCMIDLTool&quot;
-                                TargetEnvironment=&quot;3&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCCLCompilerTool&quot;
-                                AdditionalIncludeDirectories=&quot;../../../src/include;../../../src/isdn/include;../../../wanpipe/include&quot;
-                                PreprocessorDefinitions=&quot;WIN32;NDEBUG;_CONSOLE&quot;
-                                RuntimeLibrary=&quot;2&quot;
-                                UsePrecompiledHeader=&quot;0&quot;
-                                WarningLevel=&quot;3&quot;
-                                Detect64BitPortabilityProblems=&quot;true&quot;
-                                DebugInformationFormat=&quot;3&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManagedResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCResourceCompilerTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPreLinkEventTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCLinkerTool&quot;
-                                AdditionalDependencies=&quot;freetdm.lib libsangoma.lib&quot;
-                                LinkIncremental=&quot;1&quot;
-                                AdditionalLibraryDirectories=&quot;&amp;quot;$(OutDir)&amp;quot;;../../../wanpipe/api/lib/x64&quot;
-                                GenerateDebugInformation=&quot;true&quot;
-                                SubSystem=&quot;1&quot;
-                                OptimizeReferences=&quot;2&quot;
-                                EnableCOMDATFolding=&quot;2&quot;
-                                RandomizedBaseAddress=&quot;1&quot;
-                                DataExecutionPrevention=&quot;0&quot;
-                                TargetMachine=&quot;17&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCALinkTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCManifestTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCXDCMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCBscMakeTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCFxCopTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCAppVerifierTool&quot;
-                        /&gt;
-                        &lt;Tool
-                                Name=&quot;VCPostBuildEventTool&quot;
-                        /&gt;
-                &lt;/Configuration&gt;
-        &lt;/Configurations&gt;
-        &lt;References&gt;
-        &lt;/References&gt;
-        &lt;Files&gt;
-                &lt;Filter
-                        Name=&quot;Source Files&quot;
-                        Filter=&quot;cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx&quot;
-                        UniqueIdentifier=&quot;{4FC737F1-C7A5-4376-A066-2A32D752A2FF}&quot;
-                        &gt;
-                        &lt;File
-                                RelativePath=&quot;.\ftmod_wanpipe.c&quot;
-                                &gt;
-                        &lt;/File&gt;
-                &lt;/Filter&gt;
-                &lt;Filter
-                        Name=&quot;Header Files&quot;
-                        Filter=&quot;h;hpp;hxx;hm;inl;inc;xsd&quot;
-                        UniqueIdentifier=&quot;{93995380-89BD-4b04-88EB-625FBE52EBFB}&quot;
-                        &gt;
-                &lt;/Filter&gt;
-        &lt;/Files&gt;
-        &lt;Globals&gt;
-        &lt;/Globals&gt;
-&lt;/VisualStudioProject&gt;
</del><ins>+&lt;?xml version=&quot;1.0&quot; encoding=&quot;Windows-1252&quot;?&gt;
+&lt;VisualStudioProject
+        ProjectType=&quot;Visual C++&quot;
+        Version=&quot;9.00&quot;
+        Name=&quot;ftmod_wanpipe&quot;
+        ProjectGUID=&quot;{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}&quot;
+        RootNamespace=&quot;ftmod_wanpipe&quot;
+        Keyword=&quot;Win32Proj&quot;
+        TargetFrameworkVersion=&quot;131072&quot;
+        &gt;
+        &lt;Platforms&gt;
+                &lt;Platform
+                        Name=&quot;Win32&quot;
+                /&gt;
+                &lt;Platform
+                        Name=&quot;x64&quot;
+                /&gt;
+        &lt;/Platforms&gt;
+        &lt;ToolFiles&gt;
+        &lt;/ToolFiles&gt;
+        &lt;Configurations&gt;
+                &lt;Configuration
+                        Name=&quot;Debug|Win32&quot;
+                        OutputDirectory=&quot;$(SolutionDir)$(ConfigurationName)&quot;
+                        IntermediateDirectory=&quot;$(ConfigurationName)&quot;
+                        ConfigurationType=&quot;2&quot;
+                        CharacterSet=&quot;2&quot;
+                        &gt;
+                        &lt;Tool
+                                Name=&quot;VCPreBuildEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCustomBuildTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXMLDataGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCMIDLTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCLCompilerTool&quot;
+                                Optimization=&quot;0&quot;
+                                AdditionalIncludeDirectories=&quot;../../include;&amp;quot;C:\Program Files\Sangoma\include&amp;quot;&quot;
+                                PreprocessorDefinitions=&quot;WIN32;_DEBUG;_CONSOLE;&quot;
+                                MinimalRebuild=&quot;true&quot;
+                                BasicRuntimeChecks=&quot;3&quot;
+                                RuntimeLibrary=&quot;3&quot;
+                                UsePrecompiledHeader=&quot;0&quot;
+                                WarningLevel=&quot;3&quot;
+                                Detect64BitPortabilityProblems=&quot;true&quot;
+                                DebugInformationFormat=&quot;4&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManagedResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPreLinkEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCLinkerTool&quot;
+                                AdditionalDependencies=&quot;freetdm.lib libsangoma.lib&quot;
+                                LinkIncremental=&quot;2&quot;
+                                AdditionalLibraryDirectories=&quot;&amp;quot;$(OutDir)&amp;quot;;&amp;quot;C:\Program Files\Sangoma\api\lib\x86&amp;quot;&quot;
+                                GenerateDebugInformation=&quot;true&quot;
+                                SubSystem=&quot;1&quot;
+                                RandomizedBaseAddress=&quot;1&quot;
+                                DataExecutionPrevention=&quot;0&quot;
+                                TargetMachine=&quot;1&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCALinkTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManifestTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXDCMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCBscMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCFxCopTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCAppVerifierTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPostBuildEventTool&quot;
+                        /&gt;
+                &lt;/Configuration&gt;
+                &lt;Configuration
+                        Name=&quot;Release|Win32&quot;
+                        OutputDirectory=&quot;$(SolutionDir)$(ConfigurationName)&quot;
+                        IntermediateDirectory=&quot;$(ConfigurationName)&quot;
+                        ConfigurationType=&quot;2&quot;
+                        CharacterSet=&quot;2&quot;
+                        WholeProgramOptimization=&quot;1&quot;
+                        &gt;
+                        &lt;Tool
+                                Name=&quot;VCPreBuildEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCustomBuildTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXMLDataGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCMIDLTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCLCompilerTool&quot;
+                                AdditionalIncludeDirectories=&quot;../../../src/include;../../../src/isdn/include;../../../wanpipe/include&quot;
+                                PreprocessorDefinitions=&quot;WIN32;NDEBUG;_CONSOLE&quot;
+                                RuntimeLibrary=&quot;2&quot;
+                                UsePrecompiledHeader=&quot;0&quot;
+                                WarningLevel=&quot;3&quot;
+                                Detect64BitPortabilityProblems=&quot;true&quot;
+                                DebugInformationFormat=&quot;3&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManagedResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPreLinkEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCLinkerTool&quot;
+                                AdditionalDependencies=&quot;freetdm.lib libsangoma.lib&quot;
+                                LinkIncremental=&quot;1&quot;
+                                AdditionalLibraryDirectories=&quot;&amp;quot;$(OutDir)&amp;quot;;../../../wanpipe/api/lib/x86&quot;
+                                GenerateDebugInformation=&quot;true&quot;
+                                SubSystem=&quot;1&quot;
+                                OptimizeReferences=&quot;2&quot;
+                                EnableCOMDATFolding=&quot;2&quot;
+                                RandomizedBaseAddress=&quot;1&quot;
+                                DataExecutionPrevention=&quot;0&quot;
+                                TargetMachine=&quot;1&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCALinkTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManifestTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXDCMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCBscMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCFxCopTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCAppVerifierTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPostBuildEventTool&quot;
+                        /&gt;
+                &lt;/Configuration&gt;
+                &lt;Configuration
+                        Name=&quot;Debug|x64&quot;
+                        OutputDirectory=&quot;$(SolutionDir)$(PlatformName)\$(ConfigurationName)&quot;
+                        IntermediateDirectory=&quot;$(PlatformName)\$(ConfigurationName)&quot;
+                        ConfigurationType=&quot;2&quot;
+                        CharacterSet=&quot;2&quot;
+                        &gt;
+                        &lt;Tool
+                                Name=&quot;VCPreBuildEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCustomBuildTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXMLDataGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCMIDLTool&quot;
+                                TargetEnvironment=&quot;3&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCLCompilerTool&quot;
+                                Optimization=&quot;0&quot;
+                                AdditionalIncludeDirectories=&quot;../../../src/include;../../../src/isdn/include;../../../wanpipe/include&quot;
+                                PreprocessorDefinitions=&quot;WIN32;_DEBUG;_CONSOLE;&quot;
+                                MinimalRebuild=&quot;true&quot;
+                                BasicRuntimeChecks=&quot;3&quot;
+                                RuntimeLibrary=&quot;3&quot;
+                                UsePrecompiledHeader=&quot;0&quot;
+                                WarningLevel=&quot;3&quot;
+                                Detect64BitPortabilityProblems=&quot;true&quot;
+                                DebugInformationFormat=&quot;3&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManagedResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPreLinkEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCLinkerTool&quot;
+                                AdditionalDependencies=&quot;freetdm.lib libsangoma.lib&quot;
+                                LinkIncremental=&quot;2&quot;
+                                AdditionalLibraryDirectories=&quot;&amp;quot;$(OutDir)&amp;quot;;../../../wanpipe/api/lib/x64&quot;
+                                GenerateDebugInformation=&quot;true&quot;
+                                SubSystem=&quot;1&quot;
+                                RandomizedBaseAddress=&quot;1&quot;
+                                DataExecutionPrevention=&quot;0&quot;
+                                TargetMachine=&quot;17&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCALinkTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManifestTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXDCMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCBscMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCFxCopTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCAppVerifierTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPostBuildEventTool&quot;
+                        /&gt;
+                &lt;/Configuration&gt;
+                &lt;Configuration
+                        Name=&quot;Release|x64&quot;
+                        OutputDirectory=&quot;$(SolutionDir)$(PlatformName)\$(ConfigurationName)&quot;
+                        IntermediateDirectory=&quot;$(PlatformName)\$(ConfigurationName)&quot;
+                        ConfigurationType=&quot;2&quot;
+                        CharacterSet=&quot;2&quot;
+                        WholeProgramOptimization=&quot;1&quot;
+                        &gt;
+                        &lt;Tool
+                                Name=&quot;VCPreBuildEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCustomBuildTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXMLDataGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCWebServiceProxyGeneratorTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCMIDLTool&quot;
+                                TargetEnvironment=&quot;3&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCCLCompilerTool&quot;
+                                AdditionalIncludeDirectories=&quot;../../../src/include;../../../src/isdn/include;../../../wanpipe/include&quot;
+                                PreprocessorDefinitions=&quot;WIN32;NDEBUG;_CONSOLE&quot;
+                                RuntimeLibrary=&quot;2&quot;
+                                UsePrecompiledHeader=&quot;0&quot;
+                                WarningLevel=&quot;3&quot;
+                                Detect64BitPortabilityProblems=&quot;true&quot;
+                                DebugInformationFormat=&quot;3&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManagedResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCResourceCompilerTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPreLinkEventTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCLinkerTool&quot;
+                                AdditionalDependencies=&quot;freetdm.lib libsangoma.lib&quot;
+                                LinkIncremental=&quot;1&quot;
+                                AdditionalLibraryDirectories=&quot;&amp;quot;$(OutDir)&amp;quot;;../../../wanpipe/api/lib/x64&quot;
+                                GenerateDebugInformation=&quot;true&quot;
+                                SubSystem=&quot;1&quot;
+                                OptimizeReferences=&quot;2&quot;
+                                EnableCOMDATFolding=&quot;2&quot;
+                                RandomizedBaseAddress=&quot;1&quot;
+                                DataExecutionPrevention=&quot;0&quot;
+                                TargetMachine=&quot;17&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCALinkTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCManifestTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCXDCMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCBscMakeTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCFxCopTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCAppVerifierTool&quot;
+                        /&gt;
+                        &lt;Tool
+                                Name=&quot;VCPostBuildEventTool&quot;
+                        /&gt;
+                &lt;/Configuration&gt;
+        &lt;/Configurations&gt;
+        &lt;References&gt;
+        &lt;/References&gt;
+        &lt;Files&gt;
+                &lt;Filter
+                        Name=&quot;Source Files&quot;
+                        Filter=&quot;cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx&quot;
+                        UniqueIdentifier=&quot;{4FC737F1-C7A5-4376-A066-2A32D752A2FF}&quot;
+                        &gt;
+                        &lt;File
+                                RelativePath=&quot;.\ftmod_wanpipe.c&quot;
+                                &gt;
+                        &lt;/File&gt;
+                &lt;/Filter&gt;
+                &lt;Filter
+                        Name=&quot;Header Files&quot;
+                        Filter=&quot;h;hpp;hxx;hm;inl;inc;xsd&quot;
+                        UniqueIdentifier=&quot;{93995380-89BD-4b04-88EB-625FBE52EBFB}&quot;
+                        &gt;
+                &lt;/Filter&gt;
+        &lt;/Files&gt;
+        &lt;Globals&gt;
+        &lt;/Globals&gt;
+&lt;/VisualStudioProject&gt;
</ins></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludefreetdmh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/freetdm.h (17450 => 17451)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/freetdm.h        2010-04-29 13:34:53 UTC (rev 17450)
+++ freeswitch/trunk/libs/freetdm/src/include/freetdm.h        2010-04-29 14:53:03 UTC (rev 17451)
</span><span class="lines">@@ -412,13 +412,13 @@
</span><span class="cx"> typedef void *(*ftdm_calloc_func_t)(void *pool, ftdm_size_t elements, ftdm_size_t len);
</span><span class="cx"> typedef void *(*ftdm_realloc_func_t)(void *pool, void *buff, ftdm_size_t len);
</span><span class="cx"> typedef void (*ftdm_free_func_t)(void *pool, void *ptr);
</span><del>-typedef struct ftdm_memory_handler {
</del><ins>+struct ftdm_memory_handler {
</ins><span class="cx">         void *pool;
</span><span class="cx">         ftdm_malloc_func_t malloc;
</span><span class="cx">         ftdm_calloc_func_t calloc;
</span><span class="cx">         ftdm_realloc_func_t realloc;
</span><span class="cx">         ftdm_free_func_t free;
</span><del>-} ftdm_memory_handler_t;
</del><ins>+};
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> /*! \brief FreeTDM I/O layer interface argument macros 
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeftdm_declareh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/ftdm_declare.h (17450 => 17451)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/ftdm_declare.h        2010-04-29 13:34:53 UTC (rev 17450)
+++ freeswitch/trunk/libs/freetdm/src/include/ftdm_declare.h        2010-04-29 14:53:03 UTC (rev 17451)
</span><span class="lines">@@ -39,8 +39,17 @@
</span><span class="cx"> extern &quot;C&quot; {
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-/* ######## start utility macros not to be used by customers, but needed in this header, may be move to another header ############ */
</del><ins>+#if !defined(_XOPEN_SOURCE) &amp;&amp; !defined(__FreeBSD__)
+#define _XOPEN_SOURCE 600
+#endif
</ins><span class="cx"> 
</span><ins>+#ifndef HAVE_STRINGS_H
+#define HAVE_STRINGS_H 1
+#endif
+#ifndef HAVE_SYS_SOCKET_H
+#define HAVE_SYS_SOCKET_H 1
+#endif
+
</ins><span class="cx"> #ifndef __WINDOWS__
</span><span class="cx"> #if defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32) || defined(_WIN64)
</span><span class="cx"> #define __WINDOWS__
</span><span class="lines">@@ -75,6 +84,41 @@
</span><span class="cx"> #define EX_DECLARE_DATA
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#ifdef _MSC_VER
+#ifndef __inline__
+#define __inline__ __inline
+#endif
+#if (_MSC_VER &gt;= 1400)                        /* VC8+ */
+#ifndef _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
+#ifndef _CRT_NONSTDC_NO_DEPRECATE
+#define _CRT_NONSTDC_NO_DEPRECATE
+#endif
+#endif
+#ifndef strcasecmp
+#define strcasecmp(s1, s2) _stricmp(s1, s2)
+#endif
+#ifndef strncasecmp
+#define strncasecmp(s1, s2, n) _strnicmp(s1, s2, n)
+#endif
+#ifndef snprintf
+#define snprintf _snprintf
+#endif
+#ifndef S_IRUSR
+#define S_IRUSR _S_IREAD
+#endif
+#ifndef S_IWUSR
+#define S_IWUSR _S_IWRITE
+#endif
+#undef HAVE_STRINGS_H
+#undef HAVE_SYS_SOCKET_H
+/* disable warning for zero length array in a struct */
+/* this will cause errors on c99 and ansi compliant compilers and will need to be fixed in the wanpipe header files */
+#pragma warning(disable:4706)
+#pragma comment(lib, &quot;Winmm&quot;)
+#endif
+
</ins><span class="cx"> #define FTDM_STR2ENUM_P(_FUNC1, _FUNC2, _TYPE) FT_DECLARE(_TYPE) _FUNC1 (const char *name); FT_DECLARE(const char *) _FUNC2 (_TYPE type);
</span><span class="cx"> #define FTDM_STR2ENUM(_FUNC1, _FUNC2, _TYPE, _STRINGS, _MAX)        \
</span><span class="cx">         FT_DECLARE(_TYPE) _FUNC1 (const char *name)                                                        \
</span><span class="lines">@@ -100,6 +144,7 @@
</span><span class="cx">         }                                                                                                                \
</span><span class="cx"> 
</span><span class="cx"> #ifdef WIN32
</span><ins>+#include &lt;stdio.h&gt;
</ins><span class="cx"> #include &lt;windows.h&gt;
</span><span class="cx"> #define FTDM_INVALID_SOCKET INVALID_HANDLE_VALUE
</span><span class="cx"> typedef HANDLE ftdm_socket_t;
</span><span class="lines">@@ -142,6 +187,7 @@
</span><span class="cx"> typedef struct ftdm_io_interface ftdm_io_interface_t;
</span><span class="cx"> typedef struct ftdm_stream_handle ftdm_stream_handle_t;
</span><span class="cx"> typedef struct ftdm_queue ftdm_queue_t;
</span><ins>+typedef struct ftdm_memory_handler ftdm_memory_handler_t;
</ins><span class="cx"> 
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> } /* extern C */
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeftdm_osh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/ftdm_os.h (17450 => 17451)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/ftdm_os.h        2010-04-29 13:34:53 UTC (rev 17450)
+++ freeswitch/trunk/libs/freetdm/src/include/ftdm_os.h        2010-04-29 14:53:03 UTC (rev 17451)
</span><span class="lines">@@ -48,17 +48,67 @@
</span><span class="cx"> #include &lt;unistd.h&gt;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+/*! \brief sleep x amount of milliseconds */
</ins><span class="cx"> #ifdef __WINDOWS__
</span><span class="cx"> #define ftdm_sleep(x) Sleep(x)
</span><span class="cx"> #else
</span><span class="cx"> #define ftdm_sleep(x) usleep(x * 1000)
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+/*! \brief strncpy replacement */
</ins><span class="cx"> #define ftdm_copy_string(x,y,z) strncpy(x, y, z - 1) 
</span><ins>+
+/*! \brief strncpy into a fixed-length buffer */
</ins><span class="cx"> #define ftdm_set_string(x,y) strncpy(x, y, sizeof(x)-1) 
</span><ins>+
+/*! \brief check for null or zero length string buffer */
</ins><span class="cx"> #define ftdm_strlen_zero(s) (!s || *s == '\0')
</span><ins>+
+/*! \brief check for zero length string buffer */
</ins><span class="cx"> #define ftdm_strlen_zero_buf(s) (*s == '\0')
</span><span class="cx"> 
</span><ins>+/*! \brief The memory handler. 
+    Do not use directly this variable, use the memory macros and ftdm_global_set_memory_handler to override */        
+FT_DECLARE_DATA extern ftdm_memory_handler_t g_ftdm_mem_handler;
+
+/*!
+  \brief Allocate uninitialized memory
+  \param chunksize the chunk size
+*/
+#define ftdm_malloc(chunksize) g_ftdm_mem_handler.malloc(g_ftdm_mem_handler.pool, chunksize)
+
+/*!
+  \brief Reallocates memory
+  \param buff the buffer
+  \param chunksize the chunk size
+*/
+#define ftdm_realloc(buff, chunksize) g_ftdm_mem_handler.realloc(g_ftdm_mem_handler.pool, buff, chunksize)
+
+/*!
+  \brief Allocate initialized memory
+  \param chunksize the chunk size
+*/
+#define ftdm_calloc(elements, chunksize) g_ftdm_mem_handler.calloc(g_ftdm_mem_handler.pool, elements, chunksize)
+
+/*!
+  \brief Free chunk of memory
+  \param chunksize the chunk size
+*/
+#define ftdm_free(chunk) g_ftdm_mem_handler.free(g_ftdm_mem_handler.pool, chunk)
+
+/*!
+  \brief Free a pointer and set it to NULL unless it already is NULL
+  \param it the pointer
+*/
+#define ftdm_safe_free(it) if (it) { ftdm_free(it); it = NULL; }
+
+/*! \brief Duplicate string */
+FT_DECLARE(char *) ftdm_strdup(const char *str);
+
+/*! \brief Duplicate string with limit */
+FT_DECLARE(char *) ftdm_strndup(const char *str, ftdm_size_t inlen);
+
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> } /* extern C */
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeprivateftdm_coreh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/private/ftdm_core.h (17450 => 17451)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/private/ftdm_core.h        2010-04-29 13:34:53 UTC (rev 17450)
+++ freeswitch/trunk/libs/freetdm/src/include/private/ftdm_core.h        2010-04-29 14:53:03 UTC (rev 17451)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx">  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><ins>+#include &quot;freetdm.h&quot;
+
</ins><span class="cx"> #ifndef __PRIVATE_FTDM_CORE__
</span><span class="cx"> #define __PRIVATE_FTDM_CORE__
</span><span class="cx"> 
</span><span class="lines">@@ -500,12 +502,6 @@
</span><span class="cx"> 
</span><span class="cx"> FT_DECLARE_DATA extern ftdm_crash_policy_t g_ftdm_crash_policy;
</span><span class="cx"> 
</span><del>-FT_DECLARE_DATA extern ftdm_memory_handler_t g_ftdm_mem_handler;
-
-/*! \brief Duplicate string */
-FT_DECLARE(char *) ftdm_strdup(const char *str);
-FT_DECLARE(char *) ftdm_strndup(const char *str, ftdm_size_t inlen);
-
</del><span class="cx"> FT_DECLARE(ftdm_size_t) ftdm_fsk_modulator_generate_bit(ftdm_fsk_modulator_t *fsk_trans, int8_t bit, int16_t *buf, ftdm_size_t buflen);
</span><span class="cx"> FT_DECLARE(int32_t) ftdm_fsk_modulator_generate_carrier_bits(ftdm_fsk_modulator_t *fsk_trans, uint32_t bits);
</span><span class="cx"> FT_DECLARE(void) ftdm_fsk_modulator_generate_chan_sieze(ftdm_fsk_modulator_t *fsk_trans);
</span><span class="lines">@@ -599,37 +595,6 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx"> /*!
</span><del>-  \brief Allocate uninitialized memory
-  \command chunksize the chunk size
-*/
-#define ftdm_malloc(chunksize) g_ftdm_mem_handler.malloc(g_ftdm_mem_handler.pool, chunksize)
-
-/*!
-  \brief Reallocates memory
-  \command buff the buffer
-  \command chunksize the chunk size
-*/
-#define ftdm_realloc(buff, chunksize) g_ftdm_mem_handler.realloc(g_ftdm_mem_handler.pool, buff, chunksize)
-
-/*!
-  \brief Allocate initialized memory
-  \command chunksize the chunk size
-*/
-#define ftdm_calloc(elements, chunksize) g_ftdm_mem_handler.calloc(g_ftdm_mem_handler.pool, elements, chunksize)
-
-/*!
-  \brief Free chunk of memory
-  \command chunksize the chunk size
-*/
-#define ftdm_free(chunk) g_ftdm_mem_handler.free(g_ftdm_mem_handler.pool, chunk)
-
-/*!
-  \brief Free a pointer and set it to NULL unless it already is NULL
-  \command it the pointer
-*/
-#define ftdm_safe_free(it) if (it) { ftdm_free(it); it = NULL; }
-
-/*!
</del><span class="cx">   \brief Socket the given socket
</span><span class="cx">   \command it the socket
</span><span class="cx"> */
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrctestanalogc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/testanalog.c (17450 => 17451)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/testanalog.c        2010-04-29 13:34:53 UTC (rev 17450)
+++ freeswitch/trunk/libs/freetdm/src/testanalog.c        2010-04-29 14:53:03 UTC (rev 17451)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">         ftdm_channel_t *chan = (ftdm_channel_t *) obj;
</span><span class="cx">         uint8_t frame[1024];
</span><span class="cx">         ftdm_size_t len;
</span><del>-        char *number = strdup(&quot;5551212&quot;);
</del><ins>+        char *number = ftdm_strdup(&quot;5551212&quot;);
</ins><span class="cx"> 
</span><span class="cx">         ftdm_sleep(10 * 1000);
</span><span class="cx">         
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         ftdm_log(FTDM_LOG_DEBUG, &quot;call over\n&quot;);
</span><del>-        free(number);
</del><ins>+        ftdm_safe_free(number);
</ins><span class="cx">         return NULL;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>

</body>
</html>