trivial windows build fix

diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index 458538594963797316b6611bd619093c2063a4e2..7c4541671e2db1177aaec58d054189dc270f8c4f 100644 (file)
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -659,7 +659,7 @@ SWITCH_DECLARE(int) switch_split_user_domain(char *in, char **user, char **domai
 #if (_MSC_VER >= 1500)                 // VC9+
 #define switch_malloc(ptr, len) (void)(assert(((ptr) = malloc((len)))),ptr);__analysis_assume( ptr )
 #define switch_zmalloc(ptr, len) (void)(assert((ptr = calloc(1, (len)))),ptr);__analysis_assume( ptr )
-#define switch_strdup(ptr, s) (void)(assert(((ptr) = _strdup(s)((len)))),ptr);__analysis_assume( ptr )
+#define switch_strdup(ptr, s) (void)(assert(((ptr) = _strdup(s))),ptr);__analysis_assume( ptr )
 #else
 #define switch_malloc(ptr, len) (void)(assert(((ptr) = malloc((len)))),ptr)
 #define switch_zmalloc(ptr, len) (void)(assert((ptr = calloc(1, (len)))),ptr)

diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c
index 9b70335536f16c34efadaed794cab728209705ff..708e1c335c0a0aca8eefa2f9aba7332ba6f99432 100644 (file)
--- a/src/switch_ivr_async.c
+++ b/src/switch_ivr_async.c
@@ -2359,7 +2359,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_unbind_dtmf_meta_session(switch_core_
 static switch_status_t block_on_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf, switch_dtmf_direction_t direction)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
-       uint8_t enabled = (intptr_t)switch_channel_get_private(channel, SWITCH_BLOCK_DTMF_KEY);
+       uint8_t enabled = (uint8_t)(intptr_t)switch_channel_get_private(channel, SWITCH_BLOCK_DTMF_KEY);
 
        if (!enabled || switch_channel_test_flag(channel, CF_INNER_BRIDGE)) {
                return SWITCH_STATUS_SUCCESS;
@@ -2371,7 +2371,7 @@ static switch_status_t block_on_dtmf(switch_core_session_t *session, const switc
 SWITCH_DECLARE(switch_status_t) switch_ivr_unblock_dtmf_session(switch_core_session_t *session)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
-       uint8_t enabled = (intptr_t)switch_channel_get_private(channel, SWITCH_BLOCK_DTMF_KEY);
+       uint8_t enabled = (uint8_t)(intptr_t)switch_channel_get_private(channel, SWITCH_BLOCK_DTMF_KEY);
        
        if (enabled) {
                switch_channel_set_private(channel, SWITCH_BLOCK_DTMF_KEY, NULL);
@@ -2383,7 +2383,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_unblock_dtmf_session(switch_core_sess
 SWITCH_DECLARE(switch_status_t) switch_ivr_block_dtmf_session(switch_core_session_t *session)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
-       uint8_t enabled = (intptr_t)switch_channel_get_private(channel, SWITCH_BLOCK_DTMF_KEY);
+       uint8_t enabled = (uint8_t)(intptr_t)switch_channel_get_private(channel, SWITCH_BLOCK_DTMF_KEY);
 
        if (!enabled) {
                switch_channel_set_private(channel, SWITCH_BLOCK_DTMF_KEY, (void *)(intptr_t)1);