From 7ac52c2e38f3003aad236f97c843905e682008df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 7 Sep 2018 16:42:00 -0400 Subject: [PATCH] Revert "gallium/os_thread: simplify helper pipe_current_thread_get_time_nano" This reverts commit 6d477bc5460eec14c6a0d047a0384c9ce5c7609b. It fixes the Windows build hopefully. --- src/gallium/auxiliary/os/os_thread.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h index 322888b..f2629c5 100644 --- a/src/gallium/auxiliary/os/os_thread.h +++ b/src/gallium/auxiliary/os/os_thread.h @@ -165,7 +165,11 @@ pipe_tsd_set(pipe_tsd *tsd, void *value) static inline int64_t pipe_current_thread_get_time_nano(void) { - return u_thread_get_time_nano(thrd_current()); +#if defined(HAVE_PTHREAD) + return u_thread_get_time_nano(pthread_self()); +#else + return 0; +#endif } #endif /* OS_THREAD_H_ */ -- 2.7.4