From 3973de9616510e423dc8d59e9a0a9d577f3d1a06 Mon Sep 17 00:00:00 2001 From: Elliott Hughes <enh@google.com> Date: Fri, 16 May 2014 12:53:31 -0700 Subject: [PATCH] Hide __futex_wake_ex and __futex_wait_ex. Also remove some cruft that isn't needed now we're using uapi headers. Bug: 11156955 Change-Id: I936b9c5b01d8bd6bfb2e5bc0e3f86cd86739cc04 --- libc/private/bionic_futex.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/libc/private/bionic_futex.h b/libc/private/bionic_futex.h index bfc3520f7..d01b8596d 100644 --- a/libc/private/bionic_futex.h +++ b/libc/private/bionic_futex.h @@ -39,23 +39,11 @@ extern int __futex_wake(volatile void *ftx, int count); extern int __futex_syscall3(volatile void *ftx, int op, int val); extern int __futex_syscall4(volatile void *ftx, int op, int val, const struct timespec *timeout); -#ifndef FUTEX_PRIVATE_FLAG -#define FUTEX_PRIVATE_FLAG 128 -#endif - -#ifndef FUTEX_WAIT_PRIVATE -#define FUTEX_WAIT_PRIVATE (FUTEX_WAIT|FUTEX_PRIVATE_FLAG) -#endif - -#ifndef FUTEX_WAKE_PRIVATE -#define FUTEX_WAKE_PRIVATE (FUTEX_WAKE|FUTEX_PRIVATE_FLAG) -#endif - /* Like __futex_wait/wake, but take an additional 'pshared' argument. * when non-0, this will use normal futexes. Otherwise, private futexes. */ -extern int __futex_wake_ex(volatile void *ftx, int pshared, int val); -extern int __futex_wait_ex(volatile void *ftx, int pshared, int val, const struct timespec *timeout); +__LIBC_HIDDEN__ int __futex_wake_ex(volatile void* ftx, int pshared, int val); +__LIBC_HIDDEN__ int __futex_wait_ex(volatile void* ftx, int pshared, int val, const struct timespec* timeout); __END_DECLS