From a105cada55ddb632b58c90f985d755f05a5784f7 Mon Sep 17 00:00:00 2001
From: Loo Rong Jie <loorongjie@gmail.com>
Date: Thu, 12 Jul 2018 13:27:31 +0800
Subject: [PATCH 1/4] 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 0d132d98f..3acbc5c67 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;
   }

From 44976eb3bc5f796eff68d5ffeebedaeccbf7afcc Mon Sep 17 00:00:00 2001
From: Loo Rong Jie <loorongjie@gmail.com>
Date: Fri, 13 Jul 2018 07:48:27 +0800
Subject: [PATCH 2/4] Add comment and change type name

---
 absl/synchronization/internal/kernel_timeout.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/absl/synchronization/internal/kernel_timeout.h b/absl/synchronization/internal/kernel_timeout.h
index 3acbc5c67..8b2b8d684 100644
--- a/absl/synchronization/internal/kernel_timeout.h
+++ b/absl/synchronization/internal/kernel_timeout.h
@@ -114,9 +114,12 @@ 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).
-  typedef unsigned long dword;
-  dword InMillisecondsFromNow() const {
-    constexpr dword kInfinite = static_cast<dword>(-1);
+  // This header file may be included transitively by public header files,
+  // so we define our own DWORD and INFINITE instead of getting them from
+  // <intsafe.h>.
+  typedef unsigned long DWord;
+  DWord InMillisecondsFromNow() const {
+    constexpr DWord kInfinite = static_cast<DWord>(-1);
     if (!has_timeout()) {
       return kInfinite;
     }
@@ -130,10 +133,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()) {
+      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;
   }

From 407252f121bf219c8437f3393b9adc2e8bceaae2 Mon Sep 17 00:00:00 2001
From: Loo Rong Jie <loorongjie@gmail.com>
Date: Wed, 18 Jul 2018 09:53:05 +0800
Subject: [PATCH 3/4] Update comment and use std::numeric_limits<Dword>::max()

---
 absl/synchronization/internal/kernel_timeout.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/absl/synchronization/internal/kernel_timeout.h b/absl/synchronization/internal/kernel_timeout.h
index 8b2b8d684..0e50fa6d7 100644
--- a/absl/synchronization/internal/kernel_timeout.h
+++ b/absl/synchronization/internal/kernel_timeout.h
@@ -116,10 +116,10 @@ class KernelTimeout {
   // in the case of a spurious wakeup).
   // This header file may be included transitively by public header files,
   // so we define our own DWORD and INFINITE instead of getting them from
-  // <intsafe.h>.
+  // <intsafe.h> and <WinBase.h>.
   typedef unsigned long DWord;
   DWord InMillisecondsFromNow() const {
-    constexpr DWord kInfinite = static_cast<DWord>(-1);
+    constexpr DWord kInfinite = std::numeric_limits<DWord>::max();
     if (!has_timeout()) {
       return kInfinite;
     }

From 22baa38bf6145e727d08c524846ce7c91d5d42cb Mon Sep 17 00:00:00 2001
From: Loo Rong Jie <loorongjie@gmail.com>
Date: Wed, 18 Jul 2018 09:55:24 +0800
Subject: [PATCH 4/4] Convert one std::numeric_limits<Dword>::max() to
 kInfinite

---
 absl/synchronization/internal/kernel_timeout.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/absl/synchronization/internal/kernel_timeout.h b/absl/synchronization/internal/kernel_timeout.h
index 0e50fa6d7..92dffb784 100644
--- a/absl/synchronization/internal/kernel_timeout.h
+++ b/absl/synchronization/internal/kernel_timeout.h
@@ -133,7 +133,7 @@ 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()) {
+      if (ms_from_now > kInfinite) {
         return kInfinite;
       }
       return static_cast<DWord>(ms_from_now);