am 7177d1d6: am d9b06298: Merge "Hide __futex_wake_ex and __futex_wait_ex."

* commit '7177d1d6bb8f61e399dc5df1c0a15c04419ff426':
  Hide __futex_wake_ex and __futex_wait_ex.
This commit is contained in:
Elliott Hughes
2014-05-16 20:05:07 +00:00
committed by Android Git Automerger

View File

@@ -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_syscall3(volatile void *ftx, int op, int val);
extern int __futex_syscall4(volatile void *ftx, int op, int val, const struct timespec *timeout); 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. /* Like __futex_wait/wake, but take an additional 'pshared' argument.
* when non-0, this will use normal futexes. Otherwise, private futexes. * when non-0, this will use normal futexes. Otherwise, private futexes.
*/ */
extern int __futex_wake_ex(volatile void *ftx, int pshared, int val); __LIBC_HIDDEN__ 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_wait_ex(volatile void* ftx, int pshared, int val, const struct timespec* timeout);
__END_DECLS __END_DECLS