diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-02-20 09:03:43 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-02-20 09:03:43 -0800 |
| commit | 1b2f9020754a02f96d80fad7e23d46f9104df9b9 (patch) | |
| tree | bcd2c337ce3502927eba1a5216edd933078615d1 /src | |
| parent | 4a858990ed55978d451a8228b9e0b8d3e94fbd28 (diff) | |
| parent | cf476ee0b93ecf93f1c94a2ecbaa7dfe174243c3 (diff) | |
Merge pull request #645 from ctiller/32bit
Make GRPC C core compile & run on 32 bit Ubuntu systems
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/transport/chttp2/frame_data.c | 2 | ||||
| -rw-r--r-- | src/core/transport/chttp2_transport.c | 2 | ||||
| -rw-r--r-- | src/core/tsi/ssl_transport_security.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/transport/chttp2/frame_data.c b/src/core/transport/chttp2/frame_data.c index 95c27ad286..a1ae9ed2e6 100644 --- a/src/core/transport/chttp2/frame_data.c +++ b/src/core/transport/chttp2/frame_data.c @@ -135,7 +135,7 @@ grpc_chttp2_parse_error grpc_chttp2_data_parser_parse( case GRPC_CHTTP2_DATA_FRAME: if (cur == end) { return GRPC_CHTTP2_PARSE_OK; - } else if (end - cur == p->frame_size) { + } else if ((gpr_uint32)(end - cur) == p->frame_size) { state->need_flush_reads = 1; grpc_sopb_add_slice(&p->incoming_sopb, gpr_slice_sub(slice, cur - beg, end - beg)); diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index 5b2d0a5e5b..982417ec8a 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -1631,7 +1631,7 @@ static int process_read(transport *t, gpr_slice slice) { /* fallthrough */ case DTS_FRAME: GPR_ASSERT(cur < end); - if (end - cur == t->incoming_frame_size) { + if ((gpr_uint32)(end - cur) == t->incoming_frame_size) { if (!parse_frame_slice( t, gpr_slice_sub_no_ref(slice, cur - beg, end - beg), 1)) { return 0; diff --git a/src/core/tsi/ssl_transport_security.c b/src/core/tsi/ssl_transport_security.c index 2e59275ff8..92fcb96dd2 100644 --- a/src/core/tsi/ssl_transport_security.c +++ b/src/core/tsi/ssl_transport_security.c @@ -1084,7 +1084,7 @@ static int server_handshaker_factory_alpn_callback( tsi_ssl_server_handshaker_factory* factory = (tsi_ssl_server_handshaker_factory*)arg; const unsigned char* client_current = in; - while ((client_current - in) < inlen) { + while ((unsigned int)(client_current - in) < inlen) { unsigned char client_current_len = *(client_current++); const unsigned char* server_current = factory->alpn_protocol_list; while ((server_current >= factory->alpn_protocol_list) && |