diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-01-08 12:33:22 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-01-08 12:33:22 -0800 |
| commit | 8b791a4a7f784fb367af6e56c2596c578e974338 (patch) | |
| tree | ab7baa05c08aeac191768fadc766866434beb36b /src/core/surface/byte_buffer_reader.c | |
| parent | c357749b48720e00bce57c26acb2195047d63263 (diff) | |
| parent | b47eab53dec9a6d811ad26e0873dc7ec1bac7d46 (diff) | |
Merged from master and resolved merge conflicts
Diffstat (limited to 'src/core/surface/byte_buffer_reader.c')
| -rw-r--r-- | src/core/surface/byte_buffer_reader.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/surface/byte_buffer_reader.c b/src/core/surface/byte_buffer_reader.c index 57417f41b0..4679854227 100644 --- a/src/core/surface/byte_buffer_reader.c +++ b/src/core/surface/byte_buffer_reader.c @@ -110,7 +110,7 @@ gpr_slice grpc_byte_buffer_reader_readall(grpc_byte_buffer_reader *reader) { size_t bytes_read = 0; const size_t input_size = grpc_byte_buffer_length(reader->buffer_out); gpr_slice out_slice = gpr_slice_malloc(input_size); - gpr_uint8 *const outbuf = GPR_SLICE_START_PTR(out_slice); /* just an alias */ + uint8_t *const outbuf = GPR_SLICE_START_PTR(out_slice); /* just an alias */ while (grpc_byte_buffer_reader_next(reader, &in_slice) != 0) { const size_t slice_length = GPR_SLICE_LENGTH(in_slice); |