tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove reference to non-existent __LP32__."

Browse source 
am: 8aa387fbee

Change-Id: I9acb4bf22ed7e60deb356a7bda61ec97787a91c7
This commit is contained in:
Elliott Hughes 2017-08-07 23:18:03 +00:00 committed by android-build-merger
commit 45e8d1d898
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libc/include/pthread.h
View file

@ -152,7 +152,7 @@ int pthread_mutex_timedlock(pthread_mutex_t*, const struct timespec* )
int pthread_mutex_trylock(pthread_mutex_t*); int pthread_mutex_trylock(pthread_mutex_t*);
int pthread_mutex_unlock(pthread_mutex_t*); int pthread_mutex_unlock(pthread_mutex_t*);
#if defined(__LP32__) && __ANDROID_API__ < 21 #if __ANDROID_API__ < 21
/* /*
* Cruft for supporting old API levels. Pre-L we didn't have the proper POSIX * Cruft for supporting old API levels. Pre-L we didn't have the proper POSIX
* APIs for things, but instead had some locally grown, artisan equivalents. * APIs for things, but instead had some locally grown, artisan equivalents.
@ -164,7 +164,6 @@ int pthread_mutex_unlock(pthread_mutex_t*);
* * https://github.com/android-ndk/ndk/issues/423 * * https://github.com/android-ndk/ndk/issues/423
* * https://stackoverflow.com/q/44580542/632035 * * https://stackoverflow.com/q/44580542/632035
*/ */
int pthread_mutex_lock_timeout_np(pthread_mutex_t* mutex, unsigned msecs); int pthread_mutex_lock_timeout_np(pthread_mutex_t* mutex, unsigned msecs);
int pthread_cond_timeout_np(pthread_cond_t* cond, pthread_mutex_t* mutex, unsigned msecs); int pthread_cond_timeout_np(pthread_cond_t* cond, pthread_mutex_t* mutex, unsigned msecs);
int pthread_cond_timedwait_monotonic_np(pthread_cond_t*, pthread_mutex_t*, const struct timespec*); int pthread_cond_timedwait_monotonic_np(pthread_cond_t*, pthread_mutex_t*, const struct timespec*);