util: Merge duplicated function prototype in u_thread.h that named with util_barrier*

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19266>

diff --git a/src/util/u_thread.h b/src/util/u_thread.h
index 841fa9b..179f926 100644 (file)
--- 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