Tweaks to silence some compiler warnings on Windows

diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index 6869e51436c17216a861356aed8ccf987277a23b..63e6376c08fd64cc5fa8615adc968a52f122849b 100644 (file)
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -2950,7 +2950,7 @@ SWITCH_STANDARD_API(uuid_set_media_stats)
        return SWITCH_STATUS_SUCCESS;
 }
 
-#define add_stat(_i, _s) cJSON_AddItemToObject(jstats, _s, cJSON_CreateNumber(_i))
+#define add_stat(_i, _s) cJSON_AddItemToObject(jstats, _s, cJSON_CreateNumber(((double)_i)))
 
 static void jsonify_stats(cJSON *json, const char *name, switch_rtp_stats_t *stats)
 {

diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c
index 039f8776da1de51c0009a3d896d332713093f9d2..5aa3c643e8ac477830bbb8b184552b0133ab417a 100644 (file)
--- a/src/mod/applications/mod_fifo/mod_fifo.c
+++ b/src/mod/applications/mod_fifo/mod_fifo.c
@@ -1756,7 +1756,7 @@ static void *SWITCH_THREAD_FUNC o_thread_run(switch_thread_t *thread, void *obj)
 
                sql = switch_mprintf("update fifo_outbound set ring_count=ring_count-1, "
                                                         "outbound_fail_count=outbound_fail_count+1, next_avail=%ld + lag + 1 where uuid='%q'",
-                                                        (long) switch_epoch_time_now(NULL) + node->retry_delay, h->uuid);
+                                                        (long) switch_epoch_time_now(NULL) + (node ? node->retry_delay : 0), h->uuid);
                fifo_execute_sql_queued(&sql, SWITCH_TRUE, SWITCH_TRUE);
 
                if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FIFO_EVENT) == SWITCH_STATUS_SUCCESS) {

diff --git a/src/mod/codecs/mod_opus/mod_opus.2012.vcxproj b/src/mod/codecs/mod_opus/mod_opus.2012.vcxproj
index 7921694c6b232e1e893413370464567a9c4da1a3..097abe74ce1928cbc932e2b15c546c238952168b 100644 (file)
--- a/src/mod/codecs/mod_opus/mod_opus.2012.vcxproj
+++ b/src/mod/codecs/mod_opus/mod_opus.2012.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
     <ProjectConfiguration Include="Debug|Win32">\r
@@ -73,6 +73,7 @@
       <AdditionalIncludeDirectories>..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
+      <DisableSpecificWarnings>6053;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -88,6 +89,7 @@
       <AdditionalIncludeDirectories>..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
+      <DisableSpecificWarnings>6053;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -101,6 +103,7 @@
       <AdditionalIncludeDirectories>..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
+      <DisableSpecificWarnings>6053;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -116,6 +119,7 @@
       <AdditionalIncludeDirectories>..\..\..\..\libs\opus-1.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
+      <DisableSpecificWarnings>6053;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -153,4 +157,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file