[update] Conflicting files

components/libc/compilers/common/none-gcc/sys/types.h

@@ -12,6 +12,8 @@
 #define __SYS_TYPES_H__
 
 #include <stdint.h>
+#include <stddef.h>
+#include <time.h>
 
 typedef int32_t          clockid_t;
 typedef int32_t          key_t;         /* Used for interprocess communication. */
@@ -34,4 +36,4 @@ typedef unsigned int     u_int;
 typedef unsigned char    u_char;
 typedef unsigned long    u_long;
 
-#endif
+#endif

components/libc/pthreads/pthread.c

@@ -61,7 +61,7 @@ pthread_t _pthread_data_create(void)
 
     memset(ptd, 0x0, sizeof(_pthread_data_t));
     ptd->canceled = 0;
-    ptd->cancelstate = PTHREAD_CANCEL_ENABLE;
+    ptd->cancelstate = PTHREAD_CANCEL_DISABLE;
     ptd->canceltype = PTHREAD_CANCEL_DEFERRED;
     ptd->magic = PTHREAD_MAGIC;