diff options
author | Craig Tiller <craig.tiller@gmail.com> | 2015-04-28 16:55:49 -0700 |
---|---|---|
committer | Craig Tiller <craig.tiller@gmail.com> | 2015-04-28 16:55:49 -0700 |
commit | 4354a8eb28f4da2869adf38203f8a7676ff68611 (patch) | |
tree | de6cb8f307d1832a2d9521565942ed744b9c4b6f /src/core | |
parent | 37815e59db32e411c5adad32bdefbb4c02d91ae1 (diff) | |
parent | c48f26f5dc519fec2732bdf5fd29eaa50ad283ac (diff) |
Merge github.com:grpc/grpc into one-pass
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/support/alloc.c | 2 | ||||
-rw-r--r-- | src/core/support/time_win32.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/support/alloc.c b/src/core/support/alloc.c index a19a0141d4..d2ed82e771 100644 --- a/src/core/support/alloc.c +++ b/src/core/support/alloc.c @@ -55,7 +55,7 @@ void *gpr_realloc(void *p, size_t size) { } void *gpr_malloc_aligned(size_t size, size_t alignment_log) { - size_t alignment = 1 << 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)); diff --git a/src/core/support/time_win32.c b/src/core/support/time_win32.c index 539470bccf..f4443b5c2d 100644 --- a/src/core/support/time_win32.c +++ b/src/core/support/time_win32.c @@ -64,7 +64,7 @@ void gpr_sleep_until(gpr_timespec until) { } delta = gpr_time_sub(until, now); - sleep_millis = delta.tv_sec * GPR_MS_PER_SEC + delta.tv_nsec / GPR_NS_PER_MS; + sleep_millis = (DWORD)delta.tv_sec * GPR_MS_PER_SEC + delta.tv_nsec / GPR_NS_PER_MS; Sleep(sleep_millis); } } |