From df1c6283442d9eb18693df192b501fcde9914ca8 Mon Sep 17 00:00:00 2001 From: brarcher Date: Mon, 23 Jun 2014 04:13:55 +0000 Subject: [PATCH] Change name 'new' to something else Change necessary for compiling on c++ compiler, as 'new' is a reserved name. git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@1170 64e312b2-a51f-0410-8e61-82d0ca0eb02a --- lib/timer_delete.c | 12 ++++++------ lib/timer_settime.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/timer_delete.c b/lib/timer_delete.c index 189fe4c..ef38833 100644 --- a/lib/timer_delete.c +++ b/lib/timer_delete.c @@ -7,17 +7,17 @@ int timer_delete(timer_t timerid CK_ATTRIBUTE_UNUSED) * If the system does not have timer_settime() but does have * setitimer() use that instead of alarm(). */ - struct itimerval new; + struct itimerval interval; /* * Setting values to '0' results in disabling the running timer. */ - new.it_value.tv_sec = 0; - new.it_value.tv_usec = 0; - new.it_interval.tv_sec = 0; - new.it_interval.tv_usec = 0; + interval.it_value.tv_sec = 0; + interval.it_value.tv_usec = 0; + interval.it_interval.tv_sec = 0; + interval.it_interval.tv_usec = 0; - return setitimer(ITIMER_REAL, &new, NULL); + return setitimer(ITIMER_REAL, &interval, NULL); #else /* * There is only one timer, that used by alarm. diff --git a/lib/timer_settime.c b/lib/timer_settime.c index 479838b..d3b5aba 100644 --- a/lib/timer_settime.c +++ b/lib/timer_settime.c @@ -10,14 +10,14 @@ int timer_settime(timer_t timerid CK_ATTRIBUTE_UNUSED, * If the system does not have timer_settime() but does have * setitimer() use that instead of alarm(). */ - struct itimerval new; + struct itimerval interval; - new.it_value.tv_sec = new_value->it_value.tv_sec; - new.it_value.tv_usec = new_value->it_value.tv_nsec / 1000; - new.it_interval.tv_sec = new_value->it_interval.tv_sec; - new.it_interval.tv_usec = new_value->it_interval.tv_nsec / 1000; + interval.it_value.tv_sec = new_value->it_value.tv_sec; + interval.it_value.tv_usec = new_value->it_value.tv_nsec / 1000; + interval.it_interval.tv_sec = new_value->it_interval.tv_sec; + interval.it_interval.tv_usec = new_value->it_interval.tv_nsec / 1000; - return setitimer(ITIMER_REAL, &new, NULL); + return setitimer(ITIMER_REAL, &interval, NULL); #else int seconds = new_value->it_value.tv_sec; -- 2.40.0