RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-24 13:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: time: adapt the type of TV_ETERNITY to the local system

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2013-12-13 09:22:23 +01:00
parent 1d7ca2ec1f
commit 5f3f15f618
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/common/time.h
View File

@ -108,7 +108,8 @@ REGPRM2 void tv_update_date(int max_wait, int interrupted);
*/ */
REGPRM1 static inline struct timeval *tv_eternity(struct timeval *tv) 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; 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. * 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. * 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. * returns non null if tv is [0], otherwise 0.