From e6bd3544f6575c2e91c827dd9afedef9de557911 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 14 Feb 2016 08:20:35 -0600 Subject: [PATCH] Fix a name collision introduced in last commit --- sched/timer/timer_settime.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sched/timer/timer_settime.c b/sched/timer/timer_settime.c index dbba72a414f..d134441e3e8 100644 --- a/sched/timer/timer_settime.c +++ b/sched/timer/timer_settime.c @@ -299,7 +299,7 @@ int timer_settime(timer_t timerid, int flags, FAR const struct itimerspec *value FAR struct itimerspec *ovalue) { FAR struct posix_timer_s *timer = (FAR struct posix_timer_s *)timerid; - irqstate_t flags; + irqstate_t intflags; int delay; int ret = OK; @@ -339,7 +339,7 @@ int timer_settime(timer_t timerid, int flags, FAR const struct itimerspec *value * that the system timer is stable. */ - flags = enter_critical_section(); + intflags = enter_critical_section(); /* Check if abstime is selected */ @@ -381,7 +381,7 @@ int timer_settime(timer_t timerid, int flags, FAR const struct itimerspec *value 1, (uint32_t)((wdparm_t)timer)); } - leave_critical_section(flags); + leave_critical_section(intflags); return ret; }