X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Futils_time.h;h=f9973698ec2a59923d0204b5918370bc57c7d4dd;hb=a762b2b4a6d804139c9ab5f47afacc1a88d6c0c1;hp=7834723917587a9e1837ef29a72e373f08c90f3d;hpb=e1bfa71aca1f37c2f293dc9adb44065c6e7a9ad9;p=collectd.git

diff --git a/src/daemon/utils_time.h b/src/daemon/utils_time.h
index 78347239..f9973698 100644
--- a/src/daemon/utils_time.h
+++ b/src/daemon/utils_time.h
@@ -68,16 +68,16 @@ extern cdtime_t cdtime_mock;
 #define CDTIME_T_TO_DOUBLE(t) (((double) (t)) / 1073741824.0)
 #define DOUBLE_TO_CDTIME_T(d) ((cdtime_t) ((d) * 1073741824.0))
 
-#define CDTIME_T_TO_TIMEVAL(cdt,tvp) do { \
-  (tvp)->tv_sec = (time_t) ((cdt) >> 30); \
-  (tvp)->tv_usec = (suseconds_t) ((((cdt) & 0x3fffffff) * 1000000 + (1 << 29)) >> 30); \
-} while (0)
+#define CDTIME_T_TO_TIMEVAL(t) (struct timeval) { \
+  .tv_sec = (time_t) ((t) >> 30), \
+  .tv_usec = (suseconds_t) ((((t) & 0x3fffffff) * 1000000 + (1 << 29)) >> 30), \
+}
 #define TIMEVAL_TO_CDTIME_T(tv) US_TO_CDTIME_T(1000000 * (tv)->tv_sec + (tv)->tv_usec)
 
-#define CDTIME_T_TO_TIMESPEC(cdt,tsp) do { \
-  (tsp)->tv_sec = (time_t) ((cdt) >> 30); \
-  (tsp)->tv_nsec = (long) ((((cdt) & 0x3fffffff) * 1000000000 + (1 << 29)) >> 30); \
-} while (0)
+#define CDTIME_T_TO_TIMESPEC(t) (struct timespec) { \
+  .tv_sec = (time_t) ((t) >> 30), \
+  .tv_nsec = (long) ((((t) & 0x3fffffff) * 1000000000 + (1 << 29)) >> 30), \
+}
 #define TIMESPEC_TO_CDTIME_T(ts) NS_TO_CDTIME_T(1000000000ULL * (ts)->tv_sec + (ts)->tv_nsec)
 
 cdtime_t cdtime (void);