From 64ee9c1158468aaf72ed2038963b6b64ecc75627 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Fri, 21 Oct 2022 03:16:14 +0800 Subject: [PATCH] util: Merge duplicated function prototype in u_thread.h that named with util_barrier* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Yonggang Luo Reviewed-by: Marek Olšák Reviewed-by: Jesse Natalie Part-of: --- src/util/u_thread.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/util/u_thread.h b/src/util/u_thread.h index 841fa9bc868..179f926f14a 100644 --- a/src/util/u_thread.h +++ b/src/util/u_thread.h @@ -123,12 +123,6 @@ static inline bool u_thread_is_self(thrd_t thread) typedef pthread_barrier_t util_barrier; -void util_barrier_init(util_barrier *barrier, unsigned count); - -void util_barrier_destroy(util_barrier *barrier); - -bool util_barrier_wait(util_barrier *barrier); - #else /* If the OS doesn't have its own, implement barriers using a mutex and a condvar */ typedef struct { @@ -139,14 +133,14 @@ typedef struct { cnd_t condvar; } util_barrier; +#endif + void util_barrier_init(util_barrier *barrier, unsigned count); void util_barrier_destroy(util_barrier *barrier); bool util_barrier_wait(util_barrier *barrier); -#endif - #ifdef __cplusplus } #endif