From 81f750e7b2dc609e99f6568678a1fe877703ca85 Mon Sep 17 00:00:00 2001 From: zeliard Date: Mon, 27 Apr 2015 14:41:02 +0900 Subject: undo time_t type casting --- src/core/support/alloc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/core/support/alloc.c') diff --git a/src/core/support/alloc.c b/src/core/support/alloc.c index acd2432efb..d2ed82e771 100644 --- a/src/core/support/alloc.c +++ b/src/core/support/alloc.c @@ -55,12 +55,7 @@ void *gpr_realloc(void *p, size_t size) { } void *gpr_malloc_aligned(size_t size, size_t alignment_log) { -#if defined(GPR_WIN32) && defined(GPR_ARCH_64) - size_t alignment = 1ULL << alignment_log; -#else - size_t alignment = 1 << alignment_log; -#endif - + 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)); -- cgit v1.2.3