try again

r-spatial · Jun 8, 2024 · 613e38a · 613e38a
1 parent 3bba2fa
commit 613e38a
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/tools/vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc b/tools/vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc
@@ -41,15 +41,11 @@ namespace cctz {
 namespace {
 
 #if defined(_WIN32) || defined(_WIN64)
-#if defined(_UCRT)
-// Uses the globals: '_timezone', '_dstbias' and '_tzname'.
 auto tm_gmtoff(const std::tm& tm) -> decltype(_timezone + _dstbias) {
-  const bool is_dst = tm.tm_isdst > 0;
-  return _timezone + (is_dst ? _dstbias : 0);
+  // This is just a hack because s2 doesn't need this and it causes
+  // problems on Windows before UCRT.
+  return 0;
 }
-#else
-#error "Does this ever happen?"
-#endif
 auto tm_zone(const std::tm& tm) -> decltype(_tzname[0]) {
   const bool is_dst = tm.tm_isdst > 0;
   return _tzname[is_dst];