diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-09-22 15:24:44 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-09-22 15:24:44 -0700 |
| commit | f7d8860f4ff688e966159f31e2c281a22e2aa3f4 (patch) | |
| tree | 9367583b04c0e9464c6f091d699dfc64ba63a7f8 /src/core/lib/surface/byte_buffer.c | |
| parent | 76e0c1ddd536342bdc5059209da38d5406c7e717 (diff) | |
| parent | 31c66c576ad00504b34182340f8ff21bc3f447fb (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-stream-compression-eos
Diffstat (limited to 'src/core/lib/surface/byte_buffer.c')
| -rw-r--r-- | src/core/lib/surface/byte_buffer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/lib/surface/byte_buffer.c b/src/core/lib/surface/byte_buffer.c index 0bc990d487..7ed550ef87 100644 --- a/src/core/lib/surface/byte_buffer.c +++ b/src/core/lib/surface/byte_buffer.c @@ -32,7 +32,8 @@ grpc_byte_buffer *grpc_raw_compressed_byte_buffer_create( grpc_slice *slices, size_t nslices, grpc_compression_algorithm compression) { size_t i; - grpc_byte_buffer *bb = gpr_malloc(sizeof(grpc_byte_buffer)); + grpc_byte_buffer *bb = + (grpc_byte_buffer *)gpr_malloc(sizeof(grpc_byte_buffer)); bb->type = GRPC_BB_RAW; bb->data.raw.compression = compression; grpc_slice_buffer_init(&bb->data.raw.slice_buffer); @@ -45,7 +46,8 @@ grpc_byte_buffer *grpc_raw_compressed_byte_buffer_create( grpc_byte_buffer *grpc_raw_byte_buffer_from_reader( grpc_byte_buffer_reader *reader) { - grpc_byte_buffer *bb = gpr_malloc(sizeof(grpc_byte_buffer)); + grpc_byte_buffer *bb = + (grpc_byte_buffer *)gpr_malloc(sizeof(grpc_byte_buffer)); grpc_slice slice; bb->type = GRPC_BB_RAW; bb->data.raw.compression = GRPC_COMPRESS_NONE; |