X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Furcu%2Ffutex.h;h=e96b6e5fc5b2422e3ace466492ce1a73391f3870;hb=d428afc44ee5aa598c8033939ae1c1ac806f1a15;hp=039d3930c45f99eb26baa2f342a8837e8f39853f;hpb=ca91060ec7b0c64249c514ee4114753443ecd70f;p=userspace-rcu.git diff --git a/include/urcu/futex.h b/include/urcu/futex.h index 039d393..e96b6e5 100644 --- a/include/urcu/futex.h +++ b/include/urcu/futex.h @@ -30,6 +30,23 @@ #include #include +#if (defined(__linux__) && defined(__NR_futex)) + +/* For backwards compat */ +#define CONFIG_RCU_HAVE_FUTEX 1 + +#include +#include +#include +#include + +#elif defined(__FreeBSD__) + +#include +#include + +#endif + #ifdef __cplusplus extern "C" { #endif @@ -56,15 +73,7 @@ extern int compat_futex_noasync(int32_t *uaddr, int op, int32_t val, extern int compat_futex_async(int32_t *uaddr, int op, int32_t val, const struct timespec *timeout, int32_t *uaddr2, int32_t val3); -#if (defined(__linux__) && defined(__NR_futex_)) - -/* For backwards compat */ -#define CONFIG_RCU_HAVE_FUTEX 1 - -#include -#include -#include -#include +#if (defined(__linux__) && defined(__NR_futex)) static inline int futex(int32_t *uaddr, int op, int32_t val, const struct timespec *timeout, int32_t *uaddr2, int32_t val3) @@ -111,11 +120,10 @@ static inline int futex_async(int32_t *uaddr, int op, int32_t val, #elif defined(__FreeBSD__) -#include -#include - static inline int futex_async(int32_t *uaddr, int op, int32_t val, - const struct timespec *timeout, int32_t *uaddr2, int32_t val3) + const struct timespec *timeout, + int32_t *uaddr2 __attribute__((unused)), + int32_t val3 __attribute__((unused))) { int umtx_op; void *umtx_uaddr = NULL, *umtx_uaddr2 = NULL;