From a105cada55ddb632b58c90f985d755f05a5784f7 Mon Sep 17 00:00:00 2001 From: Loo Rong Jie Date: Thu, 12 Jul 2018 13:27:31 +0800 Subject: [PATCH] Remove dependency of windows.h in kernel_timeout.h --- absl/synchronization/internal/kernel_timeout.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/absl/synchronization/internal/kernel_timeout.h b/absl/synchronization/internal/kernel_timeout.h index 0d132d98..3acbc5c6 100644 --- a/absl/synchronization/internal/kernel_timeout.h +++ b/absl/synchronization/internal/kernel_timeout.h @@ -25,9 +25,6 @@ #ifndef ABSL_SYNCHRONIZATION_INTERNAL_KERNEL_TIMEOUT_H_ #define ABSL_SYNCHRONIZATION_INTERNAL_KERNEL_TIMEOUT_H_ -#ifdef _WIN32 -#include -#endif #include #include #include @@ -117,9 +114,11 @@ class KernelTimeout { // Windows. Callers should recognize that the return value is a // relative duration (it should be recomputed by calling this method // in the case of a spurious wakeup). - DWORD InMillisecondsFromNow() const { + typedef unsigned long dword; + dword InMillisecondsFromNow() const { + constexpr dword kInfinite = static_cast(-1); if (!has_timeout()) { - return INFINITE; + return kInfinite; } // The use of absl::Now() to convert from absolute time to // relative time means that absl::Now() cannot use anything that @@ -131,10 +130,10 @@ class KernelTimeout { std::numeric_limits::max() - 999999u; uint64_t ms_from_now = (std::min(max_nanos, ns_ - now) + 999999u) / 1000000u; - if (ms_from_now > std::numeric_limits::max()) { - return INFINITE; + if (ms_from_now > std::numeric_limits::max()) { + return kInfinite; } - return static_cast(ms_from_now); + return static_cast(ms_from_now); } return 0; }