From 8070e361bd2c773aa8a12cea8cf34fd7aff7c293 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 21 Sep 2017 09:43:27 -0700 Subject: Fix type --- src/core/lib/backoff/backoff.c | 2 +- src/core/lib/backoff/backoff.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/lib') diff --git a/src/core/lib/backoff/backoff.c b/src/core/lib/backoff/backoff.c index e964af8f39..b34c4a852b 100644 --- a/src/core/lib/backoff/backoff.c +++ b/src/core/lib/backoff/backoff.c @@ -34,7 +34,7 @@ void grpc_backoff_init(grpc_backoff *backoff, grpc_millis grpc_backoff_begin(grpc_exec_ctx *exec_ctx, grpc_backoff *backoff) { backoff->current_timeout_millis = backoff->initial_connect_timeout; - const int64_t first_timeout = + const grpc_millis first_timeout = GPR_MAX(backoff->current_timeout_millis, backoff->min_timeout_millis); return grpc_exec_ctx_now(exec_ctx) + first_timeout; } diff --git a/src/core/lib/backoff/backoff.h b/src/core/lib/backoff/backoff.h index c0798bbe5b..32efdb9d92 100644 --- a/src/core/lib/backoff/backoff.h +++ b/src/core/lib/backoff/backoff.h @@ -37,7 +37,7 @@ typedef struct { uint32_t rng_state; /// current retry timeout in milliseconds - int64_t current_timeout_millis; + grpc_millis current_timeout_millis; } grpc_backoff; /// Initialize backoff machinery - does not need to be destroyed -- cgit v1.2.3