diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-09-20 03:32:44 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-09-20 03:32:44 +0000 |
| commit | 0d958d200e301492abe31b498f094c23bbbb325c (patch) | |
| tree | 25431c13634f0871f4af7a1003fe292535a400eb /include | |
| parent | 34da2eeb42bf27ea4b292869822a721e273a1468 (diff) | |
| parent | eb44079fcd452e2f94066ffe0944c1390987b45e (diff) | |
Merge github.com:grpc/grpc into grpc_millis
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/slice.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/grpc/slice.h b/include/grpc/slice.h index 9d2a9fbc81..3f3cff1408 100644 --- a/include/grpc/slice.h +++ b/include/grpc/slice.h @@ -65,11 +65,7 @@ GPRAPI grpc_slice grpc_slice_new_with_len(void *p, size_t len, GPRAPI grpc_slice grpc_slice_malloc(size_t length); GPRAPI grpc_slice grpc_slice_malloc_large(size_t length); -#define GRPC_SLICE_MALLOC(len) \ - ((len) <= GRPC_SLICE_INLINED_SIZE \ - ? (grpc_slice){.refcount = NULL, \ - .data.inlined = {.length = (uint8_t)(len)}} \ - : grpc_slice_malloc_large((len))) +#define GRPC_SLICE_MALLOC(len) grpc_slice_malloc(len) /** Intern a slice: |