diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-08 10:22:42 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-08 10:22:42 -0800 |
| commit | 55e813f94669dbcc449ecb787dd3d767d43fb87f (patch) | |
| tree | 67996ac9e1299421277239742151bc220bd92466 /src/core/iomgr | |
| parent | 84b7e8cb6738a48b15ef39bc980bffafd3a6050e (diff) | |
| parent | 85474df7b3f4ba2060d2c9a9debfb3829b2131d9 (diff) | |
Merge pull request #5088 from murgatroid99/core_long_int64_t
Replace 'long' with 'int64_t' in public core headers
Diffstat (limited to 'src/core/iomgr')
| -rw-r--r-- | src/core/iomgr/iocp_windows.c | 2 | ||||
| -rw-r--r-- | src/core/iomgr/pollset_posix.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/iomgr/iocp_windows.c b/src/core/iomgr/iocp_windows.c index 96b6f81024..759340e00e 100644 --- a/src/core/iomgr/iocp_windows.c +++ b/src/core/iomgr/iocp_windows.c @@ -57,7 +57,7 @@ static HANDLE g_iocp; static DWORD deadline_to_millis_timeout(gpr_timespec deadline, gpr_timespec now) { gpr_timespec timeout; - static const int max_spin_polling_us = 10; + static const int64_t max_spin_polling_us = 10; if (gpr_time_cmp(deadline, gpr_inf_future(deadline.clock_type)) == 0) { return INFINITE; } diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index a8e2e22977..19ee6650f0 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -393,7 +393,7 @@ void grpc_pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, int grpc_poll_deadline_to_millis_timeout(gpr_timespec deadline, gpr_timespec now) { gpr_timespec timeout; - static const int max_spin_polling_us = 10; + static const int64_t max_spin_polling_us = 10; if (gpr_time_cmp(deadline, gpr_inf_future(deadline.clock_type)) == 0) { return -1; } |