From 2f77684e8dc473a48dbc19167ffe69c40ce8ada4 Mon Sep 17 00:00:00 2001 From: Derek Mauro Date: Wed, 8 Nov 2023 09:55:31 -0800 Subject: Avoid using both Win32Waiter and PthreadWaiter on MinGW, and use StdcppWaiter instead. There are various flavors of MinGW, some of which support pthread, and some of which support Win32. Instead of figuring out which platform is being used, just use the generic implementation. PiperOrigin-RevId: 580565507 Change-Id: Ia85fd7496f1e6ebdeadb95202f0039e844826118 --- absl/synchronization/internal/win32_waiter.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'absl/synchronization/internal/win32_waiter.h') diff --git a/absl/synchronization/internal/win32_waiter.h b/absl/synchronization/internal/win32_waiter.h index 87eb617c..fdab264e 100644 --- a/absl/synchronization/internal/win32_waiter.h +++ b/absl/synchronization/internal/win32_waiter.h @@ -20,7 +20,8 @@ #include #endif -#if defined(_WIN32) && _WIN32_WINNT >= _WIN32_WINNT_VISTA +#if defined(_WIN32) && !defined(__MINGW32__) && \ + _WIN32_WINNT >= _WIN32_WINNT_VISTA #include "absl/base/config.h" #include "absl/synchronization/internal/kernel_timeout.h" @@ -65,6 +66,7 @@ class Win32Waiter : public WaiterCrtp { ABSL_NAMESPACE_END } // namespace absl -#endif // defined(_WIN32) && _WIN32_WINNT >= _WIN32_WINNT_VISTA +#endif // defined(_WIN32) && !defined(__MINGW32__) && + // _WIN32_WINNT >= _WIN32_WINNT_VISTA #endif // ABSL_SYNCHRONIZATION_INTERNAL_WIN32_WAITER_H_ -- cgit v1.2.3