Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

fix trivial compile errors under windows

Browse Source
This commit is contained in:
Jeff Lenk 2010-06-17 12:52:20 -05:00
parent 3d2b23d60e
commit 091952cab7
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/esl/src/esl_json.c
View File

@ -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;

4
src/switch_ivr_originate.c
View File

@ -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;
}

6
src/switch_json.c
View File

@ -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;