diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-06-27 09:02:47 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-06-27 09:02:47 -0700 |
| commit | a6e022f98f157ff938fbfb90b5666eab83579cd2 (patch) | |
| tree | 16ef4fc47db6d17022475d96728ceacfff578617 /src/core/lib/surface/completion_queue.c | |
| parent | e010fb7d9e1b210a6d74ab4533876aae80543dd0 (diff) | |
| parent | 0c75c11f96ea14a4d53e24f3524e2fa126e1892a (diff) | |
Merge github.com:grpc/grpc into %s
Diffstat (limited to 'src/core/lib/surface/completion_queue.c')
| -rw-r--r-- | src/core/lib/surface/completion_queue.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/lib/surface/completion_queue.c b/src/core/lib/surface/completion_queue.c index db8010ef9a..72b7db1ba9 100644 --- a/src/core/lib/surface/completion_queue.c +++ b/src/core/lib/surface/completion_queue.c @@ -316,10 +316,11 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, GRPC_API_TRACE( "grpc_completion_queue_next(" "cc=%p, " - "deadline=gpr_timespec { tv_sec: %lld, tv_nsec: %d, clock_type: %d }, " + "deadline=gpr_timespec { tv_sec: %" PRId64 + ", tv_nsec: %d, clock_type: %d }, " "reserved=%p)", - 5, (cc, (long long)deadline.tv_sec, (int)deadline.tv_nsec, - (int)deadline.clock_type, reserved)); + 5, (cc, deadline.tv_sec, deadline.tv_nsec, (int)deadline.clock_type, + reserved)); GPR_ASSERT(!reserved); deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC); @@ -428,10 +429,11 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, GRPC_API_TRACE( "grpc_completion_queue_pluck(" "cc=%p, tag=%p, " - "deadline=gpr_timespec { tv_sec: %lld, tv_nsec: %d, clock_type: %d }, " + "deadline=gpr_timespec { tv_sec: %" PRId64 + ", tv_nsec: %d, clock_type: %d }, " "reserved=%p)", - 6, (cc, tag, (long long)deadline.tv_sec, (int)deadline.tv_nsec, - (int)deadline.clock_type, reserved)); + 6, (cc, tag, deadline.tv_sec, deadline.tv_nsec, (int)deadline.clock_type, + reserved)); GPR_ASSERT(!reserved); deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC); |