summaryrefslogtreecommitdiff
path: root/absl
diff options
context:
space:
mode:
authorGravatar Loo Rong Jie <loorongjie@gmail.com>2018-07-12 13:27:31 +0800
committerGravatar Loo Rong Jie <loorongjie@gmail.com>2018-07-18 08:42:48 +0800
commita105cada55ddb632b58c90f985d755f05a5784f7 (patch)
tree39e17ad86daf253ed7d6e778e330228ef55079c3 /absl
parente0def7473e52336f58759e11db4cd9467e5e0356 (diff)
Remove dependency of windows.h in kernel_timeout.h
Diffstat (limited to 'absl')
-rw-r--r--absl/synchronization/internal/kernel_timeout.h15
1 files 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 <intsafe.h>
-#endif
#include <time.h>
#include <algorithm>
#include <limits>
@@ -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<dword>(-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<int64_t>::max() - 999999u;
uint64_t ms_from_now =
(std::min<uint64_t>(max_nanos, ns_ - now) + 999999u) / 1000000u;
- if (ms_from_now > std::numeric_limits<DWORD>::max()) {
- return INFINITE;
+ if (ms_from_now > std::numeric_limits<dword>::max()) {
+ return kInfinite;
}
- return static_cast<DWORD>(ms_from_now);
+ return static_cast<dword>(ms_from_now);
}
return 0;
}