From f53aa944600ac3421ef16e87305afdf1fe15b6e5 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sat, 1 Jul 2023 19:43:03 +0200 Subject: [PATCH] [time] timeval_add -> el_timeval_add Clash with smb. --- src/util/time.c | 2 +- src/util/time.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/time.c b/src/util/time.c index 6f26c838..8cf5d3f9 100644 --- a/src/util/time.c +++ b/src/util/time.c @@ -90,7 +90,7 @@ timeval_sub(timeval_T *res, timeval_T *older, timeval_T *newer) /** @relates timeval_T */ timeval_T * -timeval_add(timeval_T *res, timeval_T *base, timeval_T *t) +el_timeval_add(timeval_T *res, timeval_T *base, timeval_T *t) { res->sec = base->sec + t->sec; res->usec = base->usec + t->usec; diff --git a/src/util/time.h b/src/util/time.h index 6b695c33..7cbf0f39 100644 --- a/src/util/time.h +++ b/src/util/time.h @@ -49,7 +49,7 @@ int timeval_is_positive(timeval_T *t); void timeval_limit_to_zero_or_one(timeval_T *t); timeval_T *timeval_now(timeval_T *t); timeval_T *timeval_sub(timeval_T *res, timeval_T *older, timeval_T *newer); -timeval_T *timeval_add(timeval_T *res, timeval_T *base, timeval_T *t); +timeval_T *el_timeval_add(timeval_T *res, timeval_T *base, timeval_T *t); int timeval_cmp(timeval_T *t1, timeval_T *t2); timeval_T *timeval_sub_interval(timeval_T *t, timeval_T *interval); timeval_T *timeval_add_interval(timeval_T *t, timeval_T *interval);