OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

sched:fix windows sim build error 

nuttx\sched\signal\sig_timedwait.c(253,13): error C2059: syntax error:'<parameter-list>'
nuttx\sched\signal\sig_timedwait.c(321,44): error C2182: '$S1': illegal use of type 'void'
nuttx\sched\signal\sig_timedwait.c(321,50): error C2059: syntax error:':'

nuttx\sched\tls\tls_initinfo.c(68,39): error C2036: 'void *': unknown size
nuttx\sched\sched\sched_get_tls.c(76,44): error C2036: 'void *': unkown size

Signed-off-by: xuxin19 <xuxin19@xiaomi.com>
This commit is contained in:
xuxin19 2024-08-14 11:52:59 +08:00 committed by Xiang Xiao
parent 363cd1c17a
commit b3f1871bc3
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sched/sched/sched_get_tls.c
View File

@ -73,5 +73,6 @@ FAR char **nxsched_get_stackargs(FAR struct tcb_s *tcb)
{
/* The args data follows the TLS data */
return (FAR char**)(tcb->stack_alloc_ptr + nxsched_get_tls(tcb)->tl_size);
return (FAR char**)((FAR char *)tcb->stack_alloc_ptr +
nxsched_get_tls(tcb)->tl_size);
}

4
sched/signal/sig_timedwait.c
View File

@ -250,7 +250,7 @@ int nxsig_timedwait(FAR const sigset_t *set, FAR struct siginfo *info,
irqstate_t flags;
sclock_t waitticks;
bool switch_needed;
siginfo_t sinfo;
siginfo_t unbinfo;
int ret;
DEBUGASSERT(set != NULL);
@ -318,7 +318,7 @@ int nxsig_timedwait(FAR const sigset_t *set, FAR struct siginfo *info,
}
#endif
rtcb->sigunbinfo = (info == NULL) ? &sinfo : info;
rtcb->sigunbinfo = (info == NULL) ? &unbinfo : info;
/* Check if we should wait for the timeout */

3
sched/tls/tls_initinfo.c
View File

@ -65,7 +65,8 @@ int tls_init_info(FAR struct tcb_s *tcb)
/* Derive tl_size w/o arch knowledge */
info->tl_size = tcb->stack_base_ptr - tcb->stack_alloc_ptr;
info->tl_size =
(FAR char *)tcb->stack_base_ptr - (FAR char *)tcb->stack_alloc_ptr;
/* Attach per-task info in group to TLS */