libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[update] Conflicting files

This commit is contained in:
liukangcc 2021-09-17 14:57:42 +08:00
parent a3541b2a24
commit f07507a913
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,8 @@
#define __SYS_TYPES_H__ #define __SYS_TYPES_H__
#include <stdint.h> #include <stdint.h>
#include <stddef.h>
#include <time.h>
typedef int32_t clockid_t; typedef int32_t clockid_t;
typedef int32_t key_t; /* Used for interprocess communication. */ 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 char u_char;
typedef unsigned long u_long; typedef unsigned long u_long;
#endif #endif

2
components/libc/pthreads/pthread.c
View File

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