Move the "cdtime_t" type to "collectd.h".

This will make it possible to turn "interval_g" into a "cdtime_t".

diff --git a/src/collectd.h b/src/collectd.h
index 8849b30b221ffa776e6e0303acab8b9919e20b02..4c347ddc10f2b2637e13c5693f64b7083c8df374 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -298,6 +298,9 @@ typedef bool _Bool;
 # endif
 #endif
 
+/* Type for time as used by "utils_time.h" */
+typedef uint64_t cdtime_t;
+
 extern char hostname_g[];
 extern int  interval_g;
 extern int  timeout_g;

diff --git a/src/utils_time.h b/src/utils_time.h
index 33384cf11f17c9d175a1d96018ecda66d4a0dc55..0c477d8c7c413af0d618f60047c0799fff14b6d6 100644 (file)
--- a/src/utils_time.h
+++ b/src/utils_time.h
@@ -32,7 +32,9 @@
  * manner is that comparing times and calculating differences is as simple as
  * it is with "time_t", i.e. a simple integer comparison / subtraction works.
  */
-typedef uint64_t cdtime_t;
+/* 
+ * cdtime_t is defined in "collectd.h" */
+/* typedef uint64_t cdtime_t; */
 
 /* 2^30 = 1073741824 */
 #define TIME_T_TO_CDTIME_T(t) (((cdtime_t) (t)) * 1073741824)