From d8cada59eec784ea3ae1d3179a33aa68c390afac Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Fri, 14 Sep 2012 12:13:36 -0500
Subject: [PATCH] windows fix for recent tpl additions to switch_event.c and
 revert a search and replace error for libtiff building

---
 libs/spandsp/src/libtiff.2008.vcproj          | 200 ++++++++--------
 w32/Library/FreeSwitchCore.2008.vcproj        | 216 +++++++++---------
 w32/Library/FreeSwitchCore.2010.vcxproj       |  35 ++-
 .../FreeSwitchCore.2010.vcxproj.filters       |   9 +
 4 files changed, 249 insertions(+), 211 deletions(-)

diff --git a/libs/spandsp/src/libtiff.2008.vcproj b/libs/spandsp/src/libtiff.2008.vcproj
index a83dc87027..4a29650333 100644
--- a/libs/spandsp/src/libtiff.2008.vcproj
+++ b/libs/spandsp/src/libtiff.2008.vcproj
@@ -16,8 +16,8 @@
 			Name="x64"
 		/>
 	</Platforms>
-	<Tooltiff-4.0.2s>
-	</Tooltiff-4.0.2s>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
@@ -157,7 +157,7 @@
 			ConfigurationType="4"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
-			BuildLogtiff-4.0.2="$(IntDir)\BuildLog $(ProjectName).htm"
+			BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -278,206 +278,206 @@
 	</Configurations>
 	<References>
 	</References>
-	<tiff-4.0.2s>
+	<Files>
 		<Filter
 			Name="Source tiff-4.0.2s"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<tiff-4.0.2
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_aux.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_close.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_codec.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_color.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_compress.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_dir.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_dirinfo.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_dirread.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_dirwrite.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_dumpmode.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_error.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_extension.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_fax3.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_fax3sm.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_flush.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_getimage.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_jpeg.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_luv.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_lzw.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_next.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_ojpeg.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_open.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_packbits.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_pixarlog.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_predict.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_print.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_read.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_strip.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_swab.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_thunder.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_tile.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_unix.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_version.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_warning.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_write.c"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_zip.c"
 				>
-			</tiff-4.0.2>
+			</File>
 		</Filter>
 		<Filter
-			Name="Header tiff-4.0.2s"
+			Name="Header Files"
 			>
-			<tiff-4.0.2
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\t4.h"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_dir.h"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_fax3.h"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tif_predict.h"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tiff.h"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tiffconf.h"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tiffio.h"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tiffio.hxx"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tiffiop.h"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\tiffvers.h"
 				>
-			</tiff-4.0.2>
-			<tiff-4.0.2
+			</File>
+			<File
 				RelativePath="..\..\tiff-4.0.2\libtiff\uvcode.h"
 				>
-			</tiff-4.0.2>
+			</File>
 		</Filter>
-	</tiff-4.0.2s>
+	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
diff --git a/w32/Library/FreeSwitchCore.2008.vcproj b/w32/Library/FreeSwitchCore.2008.vcproj
index d8f95d8d28..e4303b904d 100644
--- a/w32/Library/FreeSwitchCore.2008.vcproj
+++ b/w32/Library/FreeSwitchCore.2008.vcproj
@@ -47,8 +47,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB"
+				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;TPL_NOLIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -141,8 +141,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB"
+				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;TPL_NOLIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -234,8 +234,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC"
+				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;TPL_NOLIB;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="switch.h"
@@ -324,8 +324,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC"
+				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;TPL_NOLIB;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="switch.h"
@@ -466,97 +466,57 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\libs\stfu\stfu.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\libs\libtpl-1.5\src\tpl.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\..\libs\libtpl-1.5\src\win\mmap.c"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""
+						WarnAsError="false"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""
+						WarnAsError="false"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""
+						WarnAsError="false"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""
+						WarnAsError="false"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\libs\stfu\stfu.c"
+				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@@ -938,6 +898,54 @@
 				RelativePath="..\..\src\switch_xml_config.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libs\libtpl-1.5\src\tpl.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""
+						WarnAsError="false"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""
+						WarnAsError="false"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""
+						WarnAsError="false"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""
+						WarnAsError="false"
+					/>
+				</FileConfiguration>
+			</File>
 			<Filter
 				Name="miniupnpc"
 				>
@@ -1480,6 +1488,10 @@
 				RelativePath="..\..\src\include\g711.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libs\libtpl-1.5\src\win\mman.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\include\SimpleGlob.h"
 				>
@@ -1488,14 +1500,6 @@
 				RelativePath="..\..\libs\stfu\stfu.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\libs\libtpl-1.5\src\tpl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\libtpl-1.5\src\win\mman.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\include\switch.h"
 				>
@@ -1636,6 +1640,10 @@
 				RelativePath="..\..\src\include\switch_xml_config.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libs\libtpl-1.5\src\tpl.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj b/w32/Library/FreeSwitchCore.2010.vcxproj
index 2142a4b269..44fc58ea93 100644
--- a/w32/Library/FreeSwitchCore.2010.vcxproj
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj
@@ -88,7 +88,7 @@
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -146,8 +146,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -198,8 +198,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </PreBuildEvent>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>switch.h</PrecompiledHeaderFile>
@@ -247,8 +247,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>switch.h</PrecompiledHeaderFile>
@@ -286,6 +286,26 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\libs\libtpl-1.5\src\tpl.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</TreatWarningAsError>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</TreatWarningAsError>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</TreatWarningAsError>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</TreatWarningAsError>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\libtpl-1.5\src\win\mmap.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</TreatWarningAsError>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</TreatWarningAsError>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</TreatWarningAsError>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</TreatWarningAsError>
+    </ClCompile>
     <ClCompile Include="..\..\src\g711.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </PrecompiledHeader>
@@ -690,6 +710,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\libs\libtpl-1.5\src\tpl.h" />
     <ClInclude Include="..\..\libs\miniupnpc\declspec.h" />
     <ClInclude Include="..\..\src\include\g711.h" />
     <ClInclude Include="..\..\src\include\SimpleGlob.h" />
diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj.filters b/w32/Library/FreeSwitchCore.2010.vcxproj.filters
index 79369a8bb3..9766295d13 100644
--- a/w32/Library/FreeSwitchCore.2010.vcxproj.filters
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj.filters
@@ -202,6 +202,12 @@
     <ClCompile Include="..\..\src\switch_curl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libs\libtpl-1.5\src\tpl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\libtpl-1.5\src\win\mmap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\libs\miniupnpc\declspec.h">
@@ -321,6 +327,9 @@
     <ClInclude Include="..\..\src\include\switch_ivr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\libs\libtpl-1.5\src\tpl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\src\include\switch_version.h.template" />