Merge branch 'master' into urcu/ht

[urcu.git] / compat_futex.c

diff --git a/compat_futex.c b/compat_futex.c
index 9dfcfeb43026639696875cc36367f05a554e0888..04de5965894a7e8317049d9af80e29e36da65f02 100644 (file)
--- a/compat_futex.c
+++ b/compat_futex.c
@@ -26,9 +26,10 @@
 #include <assert.h>
 #include <errno.h>
 #include <poll.h>
+#include <stdint.h>
 
 #include <urcu/arch.h>
-#include <urcu/urcu-futex.h>
+#include <urcu/futex.h>
 
 static pthread_mutex_t compat_futex_lock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t compat_futex_cond = PTHREAD_COND_INITIALIZER;
@@ -39,8 +40,8 @@ static pthread_cond_t compat_futex_cond = PTHREAD_COND_INITIALIZER;
  * Waiter will relinquish the CPU until woken up.
  */
 
-int compat_futex_noasync(int *uaddr, int op, int val,
-       const struct timespec *timeout, int *uaddr2, int val3)
+int compat_futex_noasync(int32_t *uaddr, int op, int32_t val,
+       const struct timespec *timeout, int32_t *uaddr2, int32_t val3)
 {
        int ret, i, gret = 0;
 
@@ -84,11 +85,9 @@ end:
  * Waiter will busy-loop trying to read the condition.
  */
 
-int compat_futex_async(int *uaddr, int op, int val,
-       const struct timespec *timeout, int *uaddr2, int val3)
+int compat_futex_async(int32_t *uaddr, int op, int32_t val,
+       const struct timespec *timeout, int32_t *uaddr2, int32_t val3)
 {
-       int ret, i;
-
        /*
         * Check if NULL. Don't let users expect that they are taken into
         * account. 
@@ -112,4 +111,5 @@ int compat_futex_async(int *uaddr, int op, int val,
        default:
                return -EINVAL;
        }
+       return 0;
 }