fix trivial compile errors under windows

diff --git a/libs/esl/src/esl_json.c b/libs/esl/src/esl_json.c
index cab0b9fa525aa374acc26e324c9f66ec71262301..449c31e92b5cdb9fdd99cd13d8e30bcee05a5a67 100644 (file)
--- a/libs/esl/src/esl_json.c
+++ b/libs/esl/src/esl_json.c
@@ -33,8 +33,8 @@ static int cJSON_strcasecmp(const char *s1,const char *s2)
        return tolower(*(const unsigned char *)s1) - tolower(*(const unsigned char *)s2);
 }
 
-static void *(*cJSON_malloc)(size_t sz) = malloc;
-static void (*cJSON_free)(void *ptr) = free;
+static void *(*cJSON_malloc)(size_t sz);
+static void (*cJSON_free)(void *ptr);
 
 static char* cJSON_strdup(const char* str)
 {
@@ -158,7 +158,7 @@ static const char *parse_string(cJSON *item,const char *str)
                                        switch (len) {
                                                case 3: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6;
                                                case 2: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6;
-                                               case 1: *--ptr2 =(uc | firstByteMark[len]);
+                                               case 1: *--ptr2 =(char)(uc | firstByteMark[len]);
                                        }
                                        ptr2+=len;ptr+=4;
                                        break;

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index fa12b3719ec4c9c0bd4a6c211e00c0f484eb950e..1668f07ebd2899ec707fb06584260bdc6d6c37b5 100644 (file)
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -413,7 +413,7 @@ static uint8_t check_channel_status(originate_global_t *oglobals, originate_stat
        int pindex = -1;
        char bug_key[256] = "";
        int send_ringback = 0;
-       uint32_t ring_ready_val = 0;
+       uint8_t ring_ready_val = 0;
 
        oglobals->hups = 0;
        oglobals->idx = IDX_NADA;
@@ -452,7 +452,7 @@ static uint8_t check_channel_status(originate_global_t *oglobals, originate_stat
                        continue;
                }
 
-               if ((ring_ready_val = switch_channel_test_flag(originate_status[i].peer_channel, CF_RING_READY))) {
+               if ((ring_ready_val = (uint8_t)switch_channel_test_flag(originate_status[i].peer_channel, CF_RING_READY))) {
                        if (!originate_status[i].ring_ready) {
                                originate_status[i].ring_ready = ring_ready_val;
                        }

diff --git a/src/switch_json.c b/src/switch_json.c
index a3211e6e3ec3508e9b784b0f4157cb31384ce45a..fb78a154faf8c80a87ea1c11069fce345b7bd050 100644 (file)
--- a/src/switch_json.c
+++ b/src/switch_json.c
@@ -33,8 +33,8 @@ static int cJSON_strcasecmp(const char *s1,const char *s2)
        return tolower(*(const unsigned char *)s1) - tolower(*(const unsigned char *)s2);
 }
 
-static void *(*cJSON_malloc)(size_t sz) = malloc;
-static void (*cJSON_free)(void *ptr) = free;
+static void *(*cJSON_malloc)(size_t sz);
+static void (*cJSON_free)(void *ptr);
 
 static char* cJSON_strdup(const char* str)
 {
@@ -158,7 +158,7 @@ static const char *parse_string(cJSON *item,const char *str)
                                        switch (len) {
                                                case 3: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6;
                                                case 2: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6;
-                                               case 1: *--ptr2 =(uc | firstByteMark[len]);
+                                               case 1: *--ptr2 =(char)(uc | firstByteMark[len]);
                                        }
                                        ptr2+=len;ptr+=4;
                                        break;