diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-12-11 13:11:52 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-12-11 13:11:52 -0800 |
| commit | 46ab778aa0dbf5a328a2d35295af391d6f3a1401 (patch) | |
| tree | ecf484f3df07d163b24605a3446521674867acb3 /src/core/surface/channel.c | |
| parent | e235388bce5cf0cc8f4ea387d7cb3f078f6ec1f6 (diff) | |
| parent | 88086373db8c1d933f40d0275c4b9c8a8c9b9723 (diff) | |
Merge pull request #4397 from jtattermusch/tv_sec_64bit
Make gpr_timespec platform agnostic.
Diffstat (limited to 'src/core/surface/channel.c')
| -rw-r--r-- | src/core/surface/channel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index 573a0e742f..a873c39441 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -195,10 +195,10 @@ grpc_call *grpc_channel_create_call(grpc_channel *channel, "grpc_channel_create_call(" "channel=%p, parent_call=%p, propagation_mask=%x, cq=%p, method=%s, " "host=%s, " - "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, " + "deadline=gpr_timespec { tv_sec: %lld, tv_nsec: %d, clock_type: %d }, " "reserved=%p)", 10, (channel, parent_call, (unsigned)propagation_mask, cq, method, host, - (long)deadline.tv_sec, deadline.tv_nsec, (int)deadline.clock_type, + (long long)deadline.tv_sec, (int)deadline.tv_nsec, (int)deadline.clock_type, reserved)); GPR_ASSERT(!reserved); return grpc_channel_create_call_internal( @@ -239,10 +239,10 @@ grpc_call *grpc_channel_create_registered_call( "grpc_channel_create_registered_call(" "channel=%p, parent_call=%p, propagation_mask=%x, completion_queue=%p, " "registered_call_handle=%p, " - "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, " + "deadline=gpr_timespec { tv_sec: %lld, tv_nsec: %d, clock_type: %d }, " "reserved=%p)", 9, (channel, parent_call, (unsigned)propagation_mask, completion_queue, - registered_call_handle, (long)deadline.tv_sec, deadline.tv_nsec, + registered_call_handle, (long long)deadline.tv_sec, (int)deadline.tv_nsec, (int)deadline.clock_type, reserved)); GPR_ASSERT(!reserved); return grpc_channel_create_call_internal( |