Changeset 5a6cc679 in mainline for uspace/lib/c/include/futex.h

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/lib/c/include/futex.h (modified) (2 diffs)

uspace/lib/c/include/futex.h

@@ -126 +126 @@
  *
  */
-static inline int futex_down(futex_t *futex)
+static inline errno_t futex_down(futex_t *futex)
 {
         if ((atomic_signed_t) atomic_predec(&futex->val) < 0)
-                return (int) __SYSCALL1(SYS_FUTEX_SLEEP, (sysarg_t) &futex->val.count);
+                return (errno_t) __SYSCALL1(SYS_FUTEX_SLEEP, (sysarg_t) &futex->val.count);
         
         return EOK;
@@ -143 +143 @@
  *
  */
-static inline int futex_up(futex_t *futex)
+static inline errno_t futex_up(futex_t *futex)
 {
         if ((atomic_signed_t) atomic_postinc(&futex->val) < 0)
-                return (int) __SYSCALL1(SYS_FUTEX_WAKEUP, (sysarg_t) &futex->val.count);
+                return (errno_t) __SYSCALL1(SYS_FUTEX_WAKEUP, (sysarg_t) &futex->val.count);
         
         return EOK;