diff options
| author | Elliott Hughes <enh@google.com> | 2019-12-23 03:26:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-23 03:26:37 +0000 |
| commit | 5e2ac29165a5ecdff9be1e8b3aa0c0f968abf539 (patch) | |
| tree | cd633b203cc758ce1d4fcf95330d47166ed8250c /libc/include/pthread.h | |
| parent | 8cdacf9760ed7d4a5b3218f0342344261ab6f8aa (diff) | |
| parent | 95c6cd753f028b1afc0c6a800a3dd6bd85a5a6a0 (diff) | |
Merge "Stop using the __ANDROID_API_x__ constants."
Diffstat (limited to 'libc/include/pthread.h')
| -rw-r--r-- | libc/include/pthread.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libc/include/pthread.h b/libc/include/pthread.h index b549871f7..331e92ca2 100644 --- a/libc/include/pthread.h +++ b/libc/include/pthread.h @@ -54,7 +54,7 @@ enum { #define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP { { ((PTHREAD_MUTEX_ERRORCHECK & 3) << 14) } } #define PTHREAD_COND_INITIALIZER { { 0 } } -#if __ANDROID_API__ >= __ANDROID_API_L__ +#if __ANDROID_API__ >= 21 #define PTHREAD_COND_INITIALIZER_MONOTONIC_NP { { 1 << 1 } } #endif @@ -67,7 +67,7 @@ enum { #define PTHREAD_ONCE_INIT 0 -#if __ANDROID_API__ >= __ANDROID_API_N__ +#if __ANDROID_API__ >= 24 #define PTHREAD_BARRIER_SERIAL_THREAD -1 #endif @@ -254,20 +254,20 @@ int pthread_rwlock_trywrlock(pthread_rwlock_t* __rwlock); int pthread_rwlock_unlock(pthread_rwlock_t* __rwlock); int pthread_rwlock_wrlock(pthread_rwlock_t* __rwlock); -#if __ANDROID_API__ >= __ANDROID_API_N__ +#if __ANDROID_API__ >= 24 int pthread_barrierattr_init(pthread_barrierattr_t* __attr) __INTRODUCED_IN(24); int pthread_barrierattr_destroy(pthread_barrierattr_t* __attr) __INTRODUCED_IN(24); int pthread_barrierattr_getpshared(const pthread_barrierattr_t* __attr, int* __shared) __INTRODUCED_IN(24); int pthread_barrierattr_setpshared(pthread_barrierattr_t* __attr, int __shared) __INTRODUCED_IN(24); #endif -#if __ANDROID_API__ >= __ANDROID_API_N__ +#if __ANDROID_API__ >= 24 int pthread_barrier_init(pthread_barrier_t* __barrier, const pthread_barrierattr_t* __attr, unsigned __count) __INTRODUCED_IN(24); int pthread_barrier_destroy(pthread_barrier_t* __barrier) __INTRODUCED_IN(24); int pthread_barrier_wait(pthread_barrier_t* __barrier) __INTRODUCED_IN(24); #endif -#if __ANDROID_API__ >= __ANDROID_API_N__ +#if __ANDROID_API__ >= 24 int pthread_spin_destroy(pthread_spinlock_t* __spinlock) __INTRODUCED_IN(24); int pthread_spin_init(pthread_spinlock_t* __spinlock, int __shared) __INTRODUCED_IN(24); int pthread_spin_lock(pthread_spinlock_t* __spinlock) __INTRODUCED_IN(24); |