Module: Mesa Branch: main Commit: 1d41dd42dfbc9bfb056d68ba8c1c4205bdb9dc75 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d41dd42dfbc9bfb056d68ba8c1c4205bdb9dc75
Author: Jan Beich <[email protected]> Date: Wed Oct 19 19:43:35 2022 +0000 util: unify FreeBSD futex_wait signature with Linux/OpenBSD/Windows src/util/futex.c:73:5: error: conflicting types for 'futex_wait' int futex_wait(uint32_t *addr, int32_t value, struct timespec *timeout) ^ src/util/futex.h:50:5: note: previous declaration is here int futex_wait(uint32_t *addr, int32_t value, const struct timespec *timeout); ^ Fixes: 095dfc6caa29 ("util: Move the implementation of futex_wake and futex_wait from futex.h to futex.c") Reviewed-by: Jesse Natalie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19177> --- src/util/futex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/futex.c b/src/util/futex.c index a0e9473b37a..6c5663e3521 100644 --- a/src/util/futex.c +++ b/src/util/futex.c @@ -70,7 +70,7 @@ int futex_wake(uint32_t *addr, int count) return _umtx_op(addr, UMTX_OP_WAKE, (uint32_t)count, NULL, NULL) == -1 ? errno : 0; } -int futex_wait(uint32_t *addr, int32_t value, struct timespec *timeout) +int futex_wait(uint32_t *addr, int32_t value, const struct timespec *timeout) { void *uaddr = NULL, *uaddr2 = NULL; struct _umtx_time tmo = {
