From 14ca0b54987dd37c93864c9a37f7f3c6747c435f Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 7 Aug 2013 20:40:16 +0500
Subject: [PATCH] FS-5655 --resolve

---
 Freeswitch.2010.express.sln                      |  2 ++
 Freeswitch.2010.sln                              |  2 ++
 Freeswitch.2012.sln                              |  2 ++
 libs/spandsp/src/alloc.c                         | 11 ++++++++++-
 libs/spandsp/src/libspandsp.2010.vcxproj         |  1 +
 libs/spandsp/src/libspandsp.2010.vcxproj.filters |  3 +++
 libs/spandsp/src/libspandsp.2012.vcxproj         |  1 +
 libs/spandsp/src/libspandsp.2012.vcxproj.filters |  3 +++
 8 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Freeswitch.2010.express.sln b/Freeswitch.2010.express.sln
index 6b7c5fde3b..e554a13076 100644
--- a/Freeswitch.2010.express.sln
+++ b/Freeswitch.2010.express.sln
@@ -2081,9 +2081,11 @@ Global
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.ActiveCfg = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.Build.0 = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64.Build.0 = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.ActiveCfg = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.Build.0 = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.Build.0 = All|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln
index 65ade0314f..4148d2ddc5 100644
--- a/Freeswitch.2010.sln
+++ b/Freeswitch.2010.sln
@@ -3801,11 +3801,13 @@ Global
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.ActiveCfg = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.Build.0 = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64.Build.0 = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64 Setup.ActiveCfg = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x86 Setup.ActiveCfg = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.ActiveCfg = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.Build.0 = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.Build.0 = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64 Setup.ActiveCfg = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x86 Setup.ActiveCfg = All|Win32
 	EndGlobalSection
diff --git a/Freeswitch.2012.sln b/Freeswitch.2012.sln
index 242ebc85b6..346914e690 100644
--- a/Freeswitch.2012.sln
+++ b/Freeswitch.2012.sln
@@ -3811,11 +3811,13 @@ Global
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.ActiveCfg = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.Build.0 = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64.Build.0 = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64 Setup.ActiveCfg = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x86 Setup.ActiveCfg = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.ActiveCfg = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.Build.0 = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.ActiveCfg = All|Win32
+		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.Build.0 = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64 Setup.ActiveCfg = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x86 Setup.ActiveCfg = All|Win32
 	EndGlobalSection
diff --git a/libs/spandsp/src/alloc.c b/libs/spandsp/src/alloc.c
index d02291248c..eee961c615 100644
--- a/libs/spandsp/src/alloc.c
+++ b/libs/spandsp/src/alloc.c
@@ -48,6 +48,13 @@
 #include "spandsp/telephony.h"
 #include "spandsp/alloc.h"
 
+static void *fake_aligned_alloc(size_t alignment, size_t size);
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4232)	/* address of dllimport is not static, identity not guaranteed */
+#endif
+
 span_alloc_t __span_alloc = malloc;
 #if defined(HAVE_ALIGNED_ALLOC)
 span_aligned_alloc_t __span_aligned_alloc = aligned_alloc;
@@ -62,7 +69,9 @@ span_aligned_alloc_t __span_aligned_alloc = fake_aligned_alloc;
 span_realloc_t __span_realloc = realloc;
 span_free_t __span_free = free;
 
-static void *fake_aligned_alloc(size_t alignment, size_t size);
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 #if defined(HAVE_ALIGNED_ALLOC)
 #elif defined(HAVE_MEMALIGN)
diff --git a/libs/spandsp/src/libspandsp.2010.vcxproj b/libs/spandsp/src/libspandsp.2010.vcxproj
index 1697ba19a5..8bb87b58c6 100644
--- a/libs/spandsp/src/libspandsp.2010.vcxproj
+++ b/libs/spandsp/src/libspandsp.2010.vcxproj
@@ -157,6 +157,7 @@
   <ItemGroup>
     <ClCompile Include="ademco_contactid.c" />
     <ClCompile Include="adsi.c" />
+    <ClCompile Include="alloc.c" />
     <ClCompile Include="async.c" />
     <ClCompile Include="at_interpreter.c" />
     <ClCompile Include="awgn.c" />
diff --git a/libs/spandsp/src/libspandsp.2010.vcxproj.filters b/libs/spandsp/src/libspandsp.2010.vcxproj.filters
index 05763b180c..cc34e6c278 100644
--- a/libs/spandsp/src/libspandsp.2010.vcxproj.filters
+++ b/libs/spandsp/src/libspandsp.2010.vcxproj.filters
@@ -283,6 +283,9 @@
     <ClCompile Include="math_fixed.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="alloc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="spandsp\adsi.h">
diff --git a/libs/spandsp/src/libspandsp.2012.vcxproj b/libs/spandsp/src/libspandsp.2012.vcxproj
index 92ddbbe0c9..dd99dbc2d9 100644
--- a/libs/spandsp/src/libspandsp.2012.vcxproj
+++ b/libs/spandsp/src/libspandsp.2012.vcxproj
@@ -161,6 +161,7 @@
   <ItemGroup>
     <ClCompile Include="ademco_contactid.c" />
     <ClCompile Include="adsi.c" />
+    <ClCompile Include="alloc.c" />
     <ClCompile Include="async.c" />
     <ClCompile Include="at_interpreter.c" />
     <ClCompile Include="awgn.c" />
diff --git a/libs/spandsp/src/libspandsp.2012.vcxproj.filters b/libs/spandsp/src/libspandsp.2012.vcxproj.filters
index 05763b180c..cc34e6c278 100644
--- a/libs/spandsp/src/libspandsp.2012.vcxproj.filters
+++ b/libs/spandsp/src/libspandsp.2012.vcxproj.filters
@@ -283,6 +283,9 @@
     <ClCompile Include="math_fixed.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="alloc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="spandsp\adsi.h">