From 5f3f15f6186d27343b9d346714ea2ad1aa9a8e46 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 13 Dec 2013 09:22:23 +0100 Subject: [PATCH] BUILD: time: adapt the type of TV_ETERNITY to the local system Some systems use different types for tv_sec/tv_usec, some are signed others not. From time to time new warnings are reported about implicit casts being done. This patch ensures that TV_ETERNITY is cast to the appropriate type in assignments and conversions. --- include/common/time.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/common/time.h b/include/common/time.h index 5d86ad53e..8be47188a 100644 --- a/include/common/time.h +++ b/include/common/time.h @@ -108,7 +108,8 @@ REGPRM2 void tv_update_date(int max_wait, int interrupted); */ REGPRM1 static inline struct timeval *tv_eternity(struct timeval *tv) { - tv->tv_sec = tv->tv_usec = TV_ETERNITY; + tv->tv_sec = (typeof(tv->tv_sec))TV_ETERNITY; + tv->tv_usec = (typeof(tv->tv_usec))TV_ETERNITY; return tv; } @@ -124,12 +125,12 @@ REGPRM1 static inline struct timeval *tv_zero(struct timeval *tv) { /* * returns non null if tv is [eternity], otherwise 0. */ -#define tv_iseternity(tv) ((tv)->tv_usec == TV_ETERNITY) +#define tv_iseternity(tv) ((tv)->tv_usec == (typeof((tv)->tv_usec))TV_ETERNITY) /* * returns 0 if tv is [eternity], otherwise non-zero. */ -#define tv_isset(tv) ((tv)->tv_usec != TV_ETERNITY) +#define tv_isset(tv) ((tv)->tv_usec != (typeof((tv)->tv_usec))TV_ETERNITY) /* * returns non null if tv is [0], otherwise 0.