FS-5690 --resolve with bizarre workaround

diff --git a/libs/spandsp/src/msvc/spandsp.h b/libs/spandsp/src/msvc/spandsp.h
index fbdfac8e49f6a362db996e7dd91401c09b2f0eea..ec0b629d27c79af58183d720ec16d97f193e2c5c 100644 (file)
--- a/libs/spandsp/src/msvc/spandsp.h
+++ b/libs/spandsp/src/msvc/spandsp.h
@@ -48,6 +48,9 @@
 #include <math.h>
 #include <tiffio.h>
 
+#if !defined(__cplusplus)
+#include <spandsp/stdbool.h>
+#endif
 #include <spandsp/telephony.h>
 #include <spandsp/fast_convert.h>
 #include <spandsp/logging.h>

diff --git a/src/switch_console.c b/src/switch_console.c
index b2c003a6c6c986754a58175dc928d4590f17cd68..eea6d5510b6f55c3d63fd2079c1d50ba52cf3cd0 100644 (file)
--- a/src/switch_console.c
+++ b/src/switch_console.c
@@ -33,7 +33,9 @@
 #include <switch.h>
 #include <switch_console.h>
 #include <switch_version.h>
+#ifndef _MSC_VER
 #include <switch_private.h>
+#endif
 #define CMD_BUFLEN 1024
 
 #ifdef SWITCH_HAVE_LIBEDIT

diff --git a/src/switch_scheduler.c b/src/switch_scheduler.c
index b71821e2983acff6947f019cdc3e2578a36297a8..8e0a7d0963119315ee630058e482363d1340c8c5 100644 (file)
--- a/src/switch_scheduler.c
+++ b/src/switch_scheduler.c
@@ -201,7 +201,7 @@ SWITCH_DECLARE(uint32_t) switch_scheduler_add_task(time_t task_runtime,
        switch_assert(func);
 
        if (task_runtime < now) {
-               container->task.repeat = task_runtime;
+               container->task.repeat = (uint32_t)task_runtime;
                task_runtime += now;
        }