From: Lukasz Majewski Date: Tue, 8 Sep 2020 08:48:13 +0000 (+0200) Subject: nptl: futex: Move __NR_futex_time64 alias to beginning of futex-internal.h X-Git-Tag: glibc-2.33~450 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e75fbaaa21563cecccfda9705260ae0b608ed660;p=thirdparty%2Fglibc.git nptl: futex: Move __NR_futex_time64 alias to beginning of futex-internal.h This alias macro shall be moved to the beginning of the futex-internal.h to be easily reused by other functions, which would support 64 bit time. Reviewed-by: Alistair Francis Reviewed-by: Adhemerval Zanella --- diff --git a/sysdeps/nptl/futex-internal.h b/sysdeps/nptl/futex-internal.h index 84ab3f38533..7f3910ad982 100644 --- a/sysdeps/nptl/futex-internal.h +++ b/sysdeps/nptl/futex-internal.h @@ -74,6 +74,10 @@ # error FUTEX_PRIVATE must be equal to 0 #endif +#ifndef __NR_futex_time64 +# define __NR_futex_time64 __NR_futex +#endif + /* Calls __libc_fatal with an error message. Convenience function for concrete implementations of the futex interface. */ static __always_inline __attribute__ ((__noreturn__)) void @@ -467,10 +471,6 @@ futex_unlock_pi (unsigned int *futex_word, int private) } } -#ifndef __NR_futex_time64 -# define __NR_futex_time64 __NR_futex -#endif - static __always_inline int futex_timed_wait_cancel64 (pid_t *tidp, pid_t tid, const struct __timespec64 *timeout, int private)