From f07507a91310bc5696a08f5bbf6ab8679cfbcf73 Mon Sep 17 00:00:00 2001 From: liukangcc Date: Fri, 17 Sep 2021 14:57:42 +0800 Subject: [update] Conflicting files --- components/libc/pthreads/pthread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/libc/pthreads/pthread.c') diff --git a/components/libc/pthreads/pthread.c b/components/libc/pthreads/pthread.c index 3df51caca6..b0bf39dff6 100644 --- a/components/libc/pthreads/pthread.c +++ b/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; -- cgit v1.3.1