From b0bcda7a3ef8c13ffc020be07cc9cfcf7d0ad98c Mon Sep 17 00:00:00 2001 From: Max Lv Date: Mon, 6 Jan 2014 12:47:59 +0800 Subject: [PATCH] fix compile issues in cygwin --- src/json.c | 6 +++--- src/udprelay.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/json.c b/src/json.c index 052e6db5..4a0ee79e 100644 --- a/src/json.c +++ b/src/json.c @@ -508,14 +508,14 @@ whitespace: default: - if (isdigit (b) || b == '-') + if (isdigit ((unsigned char)b) || b == '-') { if (!new_value (&state, &top, &root, &alloc, json_integer)) goto e_alloc_failure; if (!state.first_pass) { - while (isdigit (b) || b == '+' || b == '-' + while (isdigit ((unsigned char)b) || b == '+' || b == '-' || b == 'e' || b == 'E' || b == '.') { b = *++ i; @@ -600,7 +600,7 @@ whitespace: case json_integer: case json_double: - if (isdigit (b)) + if (isdigit ((unsigned char)b)) { ++ num_digits; diff --git a/src/udprelay.c b/src/udprelay.c index 72f5015e..dac7a2a9 100644 --- a/src/udprelay.c +++ b/src/udprelay.c @@ -445,7 +445,7 @@ static void remote_recv_cb (EV_P_ ev_io *w, int revents) ev_timer_again(EV_A_ &remote_ctx->watcher); struct sockaddr src_addr; - unsigned int addr_len = sizeof(src_addr); + socklen_t addr_len = sizeof(src_addr); unsigned int addr_header_len = remote_ctx->addr_header_len; char *buf = malloc(BUF_SIZE); @@ -512,7 +512,7 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents) struct sockaddr src_addr; char *buf = malloc(BUF_SIZE); - unsigned int addr_len = sizeof(src_addr); + socklen_t addr_len = sizeof(src_addr); unsigned int offset = 0; ssize_t buf_len = recvfrom(server_ctx->fd, buf, BUF_SIZE, 0, &src_addr, &addr_len);