aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/ext/client_config
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-06-27 09:02:47 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-06-27 09:02:47 -0700
commita6e022f98f157ff938fbfb90b5666eab83579cd2 (patch)
tree16ef4fc47db6d17022475d96728ceacfff578617 /src/core/ext/client_config
parente010fb7d9e1b210a6d74ab4533876aae80543dd0 (diff)
parent0c75c11f96ea14a4d53e24f3524e2fa126e1892a (diff)
Merge github.com:grpc/grpc into %s
Diffstat (limited to 'src/core/ext/client_config')
-rw-r--r--src/core/ext/client_config/channel_connectivity.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/ext/client_config/channel_connectivity.c b/src/core/ext/client_config/channel_connectivity.c
index 20c01a9a7c..c1220e3a8c 100644
--- a/src/core/ext/client_config/channel_connectivity.c
+++ b/src/core/ext/client_config/channel_connectivity.c
@@ -189,10 +189,11 @@ void grpc_channel_watch_connectivity_state(
GRPC_API_TRACE(
"grpc_channel_watch_connectivity_state("
"channel=%p, last_observed_state=%d, "
- "deadline=gpr_timespec { tv_sec: %lld, tv_nsec: %d, clock_type: %d }, "
+ "deadline=gpr_timespec { tv_sec: %" PRId64
+ ", tv_nsec: %d, clock_type: %d }, "
"cq=%p, tag=%p)",
- 7, (channel, (int)last_observed_state, (long long)deadline.tv_sec,
- (int)deadline.tv_nsec, (int)deadline.clock_type, cq, tag));
+ 7, (channel, (int)last_observed_state, deadline.tv_sec, deadline.tv_nsec,
+ (int)deadline.clock_type, cq, tag));
grpc_cq_begin_op(cq, tag);