FS-5655 --resolve

diff --git a/Freeswitch.2010.express.sln b/Freeswitch.2010.express.sln
index 6b7c5fde3bb8a7538e1672d66fb69b01fda3190f..e554a1307693937105aebb070e554dd500e4cf72 100644 (file)
--- 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\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.Build.0 = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64.ActiveCfg = All|Win32\r
+               {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64.Build.0 = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.ActiveCfg = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.Build.0 = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.ActiveCfg = All|Win32\r
+               {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.Build.0 = All|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln
index 65ade0314f82f06b99115c12e0af132e109b6439..4148d2ddc516fd58f67c5e89be940ef8f2ca5c00 100644 (file)
--- a/Freeswitch.2010.sln
+++ b/Freeswitch.2010.sln
@@ -3801,11 +3801,13 @@ Global
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.ActiveCfg = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.Build.0 = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64.ActiveCfg = All|Win32\r
+               {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64.Build.0 = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64 Setup.ActiveCfg = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x86 Setup.ActiveCfg = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.ActiveCfg = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.Build.0 = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.ActiveCfg = All|Win32\r
+               {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.Build.0 = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64 Setup.ActiveCfg = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x86 Setup.ActiveCfg = All|Win32\r
        EndGlobalSection\r

diff --git a/Freeswitch.2012.sln b/Freeswitch.2012.sln
index 242ebc85b6e6831495f05d5f6848b4eaf3c39047..346914e690de88e5c575d50b84cf7e9ff44d189a 100644 (file)
--- a/Freeswitch.2012.sln
+++ b/Freeswitch.2012.sln
@@ -3811,11 +3811,13 @@ Global
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.ActiveCfg = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|Win32.Build.0 = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64.ActiveCfg = All|Win32\r
+               {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64.Build.0 = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x64 Setup.ActiveCfg = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Debug|x86 Setup.ActiveCfg = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.ActiveCfg = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.Build.0 = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.ActiveCfg = All|Win32\r
+               {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.Build.0 = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64 Setup.ActiveCfg = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x86 Setup.ActiveCfg = All|Win32\r
        EndGlobalSection\r

diff --git a/libs/spandsp/src/alloc.c b/libs/spandsp/src/alloc.c
index d02291248c06d03be4419751bb6a9c1335e930b2..eee961c61576e43dd019a090756adeb79b2a4e52 100644 (file)
--- 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 1697ba19a58faabba6e9979d33c94090a92bc0d9..8bb87b58c60e425d023ddaa788dccdb6dd4d1c3b 100644 (file)
--- a/libs/spandsp/src/libspandsp.2010.vcxproj
+++ b/libs/spandsp/src/libspandsp.2010.vcxproj
@@ -157,6 +157,7 @@
   <ItemGroup>\r
     <ClCompile Include="ademco_contactid.c" />\r
     <ClCompile Include="adsi.c" />\r
+    <ClCompile Include="alloc.c" />\r
     <ClCompile Include="async.c" />\r
     <ClCompile Include="at_interpreter.c" />\r
     <ClCompile Include="awgn.c" />\r

diff --git a/libs/spandsp/src/libspandsp.2010.vcxproj.filters b/libs/spandsp/src/libspandsp.2010.vcxproj.filters
index 05763b180c5ecb606b1657130a619d9f33c4130b..cc34e6c2785395915ac35e3064d91f07c0e61a78 100644 (file)
--- 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">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="alloc.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="spandsp\adsi.h">\r

diff --git a/libs/spandsp/src/libspandsp.2012.vcxproj b/libs/spandsp/src/libspandsp.2012.vcxproj
index 92ddbbe0c9f4de43670797f787236f59e3ab1512..dd99dbc2d9c8e1b63c302825a570e95a1a1ae460 100644 (file)
--- a/libs/spandsp/src/libspandsp.2012.vcxproj
+++ b/libs/spandsp/src/libspandsp.2012.vcxproj
@@ -161,6 +161,7 @@
   <ItemGroup>\r
     <ClCompile Include="ademco_contactid.c" />\r
     <ClCompile Include="adsi.c" />\r
+    <ClCompile Include="alloc.c" />\r
     <ClCompile Include="async.c" />\r
     <ClCompile Include="at_interpreter.c" />\r
     <ClCompile Include="awgn.c" />\r

diff --git a/libs/spandsp/src/libspandsp.2012.vcxproj.filters b/libs/spandsp/src/libspandsp.2012.vcxproj.filters
index 05763b180c5ecb606b1657130a619d9f33c4130b..cc34e6c2785395915ac35e3064d91f07c0e61a78 100644 (file)
--- 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">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="alloc.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="spandsp\adsi.h">\r