36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 79be156837e69e90daf9937c81b5b714bab8492c Mon Sep 17 00:00:00 2001
|
|
From: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
Date: Sat, 14 Apr 2018 15:34:05 +0200
|
|
Subject: [PATCH 17/23] Do not get confused by the presence of winpthread
|
|
|
|
We still have no ClockNow() defined on Windows...
|
|
|
|
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
---
|
|
deps/v8/src/base/platform/time.cc | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/deps/v8/src/base/platform/time.cc b/deps/v8/src/base/platform/time.cc
|
|
index e04e5e44..3561c249 100644
|
|
--- a/deps/v8/src/base/platform/time.cc
|
|
+++ b/deps/v8/src/base/platform/time.cc
|
|
@@ -804,13 +804,13 @@ ThreadTicks ThreadTicks::Now() {
|
|
return ThreadTicks(ComputeThreadTicks());
|
|
#elif V8_OS_FUCHSIA
|
|
return ThreadTicks(GetFuchsiaThreadTicks());
|
|
+#elif V8_OS_WIN
|
|
+ return ThreadTicks::GetForThread(::GetCurrentThread());
|
|
#elif (defined(_POSIX_THREAD_CPUTIME) && (_POSIX_THREAD_CPUTIME >= 0)) || \
|
|
defined(V8_OS_ANDROID) || defined(V8_OS_ZOS)
|
|
return ThreadTicks(ClockNow(CLOCK_THREAD_CPUTIME_ID));
|
|
#elif V8_OS_SOLARIS
|
|
return ThreadTicks(gethrvtime() / Time::kNanosecondsPerMicrosecond);
|
|
-#elif V8_OS_WIN
|
|
- return ThreadTicks::GetForThread(::GetCurrentThread());
|
|
#else
|
|
UNREACHABLE();
|
|
#endif
|
|
--
|
|
2.17.0.windows.1
|
|
|