diff options
| author | liukangcc <[email protected]> | 2021-09-17 14:57:42 +0800 |
|---|---|---|
| committer | liukangcc <[email protected]> | 2021-09-17 14:58:15 +0800 |
| commit | f07507a91310bc5696a08f5bbf6ab8679cfbcf73 (patch) | |
| tree | c118f7434aab71c536fcf03c8a1490c643c40ea4 /components/libc/pthreads/pthread.c | |
| parent | a3541b2a243bdf1cc49029b696b217ce752199c7 (diff) | |
[update] Conflicting files
Diffstat (limited to 'components/libc/pthreads/pthread.c')
| -rw-r--r-- | components/libc/pthreads/pthread.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |