am 39804dcd: Merge "Fix the pthread_setname_np test."

* commit '39804dcde6c1c596285432b28cdb09382ce59663':
  Fix the pthread_setname_np test.
This commit is contained in:
Elliott Hughes
2013-02-15 14:48:05 -08:00
committed by Android Git Automerger
14 changed files with 106 additions and 115 deletions

View File

@@ -78,9 +78,6 @@ enum {
#define GLOBAL_INIT_THREAD_LOCAL_BUFFER_COUNT 4
#define BIONIC_TLS_SLOTS 64
/* set the Thread Local Storage, must contain at least BIONIC_TLS_SLOTS pointers */
extern void __init_tls(void** tls, void* thread_info);
/* syscall only, do not call directly */
extern int __set_tls(void* ptr);