resolved conflicts for merge of 7b6e6fa5 to kraken

Change-Id: I2b9b80a7fa32c56be2b85ff8be0d6e7ac1848afe
2010-06-03 15:05:04 -07:00
parent fcd00ebbdf 7b6e6fa572
commit a8a2148863
2 changed files with 56 additions and 0 deletions
--- a/libc/include/pthread.h
+++ b/libc/include/pthread.h
@@ -266,6 +266,8 @@ int pthread_getcpuclockid(pthread_t  tid, clockid_t  *clockid);

 int pthread_once(pthread_once_t  *once_control, void (*init_routine)(void));

+int pthread_setname_np(pthread_t thid, const char *thname);
+
 typedef void  (*__pthread_cleanup_func_t)(void*);

 typedef struct __pthread_cleanup_t {