projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
c88393d
)
Merge pull request #1309 from baryonix/time_fix
author
Marc Fournier
<marc.fournier@camptocamp.com>
Fri, 30 Oct 2015 21:33:19 +0000
(22:33 +0100)
committer
Marc Fournier
<marc.fournier@camptocamp.com>
Fri, 30 Oct 2015 21:33:19 +0000
(22:33 +0100)
Fix TIMESPEC_TO_CDTIME_T() on 32-bit arch.
src/daemon/utils_time.h
patch
|
blob
|
history
diff --git
a/src/daemon/utils_time.h
b/src/daemon/utils_time.h
index
2cc84b5
..
6566a73
100644
(file)
--- a/
src/daemon/utils_time.h
+++ b/
src/daemon/utils_time.h
@@
-72,7
+72,7
@@
(tsp)->tv_sec = CDTIME_T_TO_TIME_T (cdt); \
(tsp)->tv_nsec = (long) CDTIME_T_TO_NS ((cdt) & 0x3fffffff); \
} while (0)
-#define TIMESPEC_TO_CDTIME_T(ts) NS_TO_CDTIME_T(1000000000 * (ts)->tv_sec + (ts)->tv_nsec)
+#define TIMESPEC_TO_CDTIME_T(ts) NS_TO_CDTIME_T(1000000000
ULL
* (ts)->tv_sec + (ts)->tv_nsec)
cdtime_t cdtime (void);