diff options
author | 2016-01-08 15:50:45 -0800 | |
---|---|---|
committer | 2016-01-08 15:50:45 -0800 | |
commit | 4dfe317e5dc1c11688e8ab95c1a62c12553f43ad (patch) | |
tree | 30461dcf9f15a6e656440dcbc47302713741c111 /src/core/support/alloc.c | |
parent | 8974a6681c430357632f5da4cc98f88ac46fe9e9 (diff) | |
parent | 7f34c783c4735ce16c22cd4c92d989d4bb0e2822 (diff) |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to 'src/core/support/alloc.c')
-rw-r--r-- | src/core/support/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/support/alloc.c b/src/core/support/alloc.c index ca72379b1d..0a064b2c18 100644 --- a/src/core/support/alloc.c +++ b/src/core/support/alloc.c @@ -82,7 +82,7 @@ void *gpr_malloc_aligned(size_t size, size_t alignment_log) { size_t alignment = ((size_t)1) << alignment_log; size_t extra = alignment - 1 + sizeof(void *); void *p = gpr_malloc(size + extra); - void **ret = (void **)(((gpr_uintptr)p + extra) & ~(alignment - 1)); + void **ret = (void **)(((uintptr_t)p + extra) & ~(alignment - 1)); ret[-1] = p; return (void *)ret; } |