nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

sched/signal: Fix compilation errors for MSVC.

Browse source 
This commit removed empty struct to fix compilation errors for the MSVC compiler.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
This commit is contained in:
ouyangxiangzhen 2024-09-29 17:23:47 +08:00 committed by Xiang Xiao
parent 39576af753
commit c0ae6525c4
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/nuttx/signal.h
View file

@ -65,11 +65,9 @@
struct sigwork_s
{
#ifdef CONFIG_SIG_EVTHREAD
struct work_s work; /* Work queue structure */
union sigval value; /* Data passed with notification */
sigev_notify_function_t func; /* Notification function */
#endif
};
#ifdef __cplusplus
@ -642,7 +640,7 @@ int nxsig_notification(pid_t pid, FAR struct sigevent *event,
#ifdef CONFIG_SIG_EVTHREAD
void nxsig_cancel_notification(FAR struct sigwork_s *work);
#else
# define nxsig_cancel_notification(work) (void)(work)
# define nxsig_cancel_notification(work)
#endif
#ifdef __cplusplus

2
sched/timer/timer.h
View file

@ -63,7 +63,9 @@ struct posix_timer_s
clock_t pt_expected; /* Expected absolute time */
struct wdog_s pt_wdog; /* The watchdog that provides the timing */
struct sigevent pt_event; /* Notification information */
#ifdef CONFIG_SIG_EVTHREAD
struct sigwork_s pt_work;
#endif
};
/****************************************************************************

5
sched/timer/timer_settime.c
View file

@ -72,8 +72,13 @@ static void timer_timeout(wdparm_t itimer);
static inline void timer_signotify(FAR struct posix_timer_s *timer)
{
#ifdef CONFIG_SIG_EVTHREAD
DEBUGVERIFY(nxsig_notification(timer->pt_owner, &timer->pt_event,
SI_TIMER, &timer->pt_work));
#else
DEBUGVERIFY(nxsig_notification(timer->pt_owner, &timer->pt_event,
SI_TIMER, NULL));
#endif
}
/****************************************************************************