diff --git a/src/utl/test.h b/src/utl/test.h index 5b4cd93..f25fd6a 100644 --- a/src/utl/test.h +++ b/src/utl/test.h @@ -108,12 +108,12 @@ static void cmc_test_log(const char *unit_name, const char *current_test, bool a tinfo.verbose = VERBOSE; \ \ /* Tests */ \ - timer_start(timer); \ + cmc_timer_start(timer); \ \ BODY; \ \ - timer_stop(timer); \ - timer_calc(timer); \ + cmc_timer_stop(timer); \ + cmc_timer_calc(timer); \ \ unittest_abort: \ if (tinfo.aborted) \ diff --git a/src/utl/timer.h b/src/utl/timer.h index b3b77f3..eb6db99 100644 --- a/src/utl/timer.h +++ b/src/utl/timer.h @@ -22,7 +22,7 @@ typedef struct cmc_timer_s double result; } cmc_timer; -#define timer_start(timer) \ +#define cmc_timer_start(timer) \ do \ { \ cmc_timer *t = &(timer); \ @@ -30,15 +30,15 @@ typedef struct cmc_timer_s \ } while (0) -#define timer_stop(timer) \ - do \ - { \ - cmc_timer *t = &(timer);\ - t->stop = clock(); \ - \ +#define cmc_timer_stop(timer) \ + do \ + { \ + cmc_timer *t = &(timer); \ + t->stop = clock(); \ + \ } while (0) -#define timer_calc(timer) \ +#define cmc_timer_calc(timer) \ do \ { \ cmc_timer *t = &(timer); \