resolved conflicts for merge of 4f086aeb to gingerbread-plus-aosp

Change-Id: Ice2a6d41a7e9d04eca02e15ed189d648d61b5801
2010-07-23 13:53:19 -07:00
parent 4e69dfed0b 4f086aeb4a
commit 6d4d8cb79c
6 changed files with 137 additions and 0 deletions
--- a/libc/include/pthread.h
+++ b/libc/include/pthread.h
@@ -268,6 +268,8 @@ int pthread_once(pthread_once_t  *once_control, void (*init_routine)(void));

 int pthread_setname_np(pthread_t thid, const char *thname);

+int pthread_atfork(void (*prepare)(void), void (*parent)(void), void(*child)(void));
+
 typedef void  (*__pthread_cleanup_func_t)(void*);

 typedef struct __pthread_cleanup_t {