From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 28 Aug 2015 18:29:16 +0000 (+0200)
Subject: Moved time_msec_t from typedefs.h to SquidTime.h
X-Git-Tag: SQUID_4_0_1~81^2~10^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ebc477d0f91e823f54ffeaa961d64f7f6da7c1f;p=thirdparty%2Fsquid.git

Moved time_msec_t from typedefs.h to SquidTime.h
---

diff --git a/src/DiskIO/DiskFile.h b/src/DiskIO/DiskFile.h
index 3d2646de44..4695763616 100644
--- a/src/DiskIO/DiskFile.h
+++ b/src/DiskIO/DiskFile.h
@@ -10,7 +10,7 @@
 #define SQUID_DISKFILE_H
 
 #include "base/RefCount.h"
-#include "typedefs.h"
+#include "SquidTime.h"
 
 class IORequestor;
 
diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index 22c9d3dd4e..ff0aa92c24 100644
--- a/src/SquidConfig.h
+++ b/src/SquidConfig.h
@@ -18,6 +18,7 @@
 #include "ip/Address.h"
 #include "Notes.h"
 #include "security/forward.h"
+#include "SquidTime.h"
 #include "YesNoNone.h"
 
 #if USE_OPENSSL
diff --git a/src/SquidTime.h b/src/SquidTime.h
index c4fa27e4ec..dc5653351e 100644
--- a/src/SquidTime.h
+++ b/src/SquidTime.h
@@ -16,6 +16,9 @@
 #include <ctime>
 /* NP: sys/time.h is provided by libcompat */
 
+/*Use uint64_t to store miliseconds*/
+typedef uint64_t time_msec_t;
+
 /* globals for accessing time */
 extern struct timeval current_time;
 extern double current_dtime;
diff --git a/src/typedefs.h b/src/typedefs.h
index 6bca8aca28..1d5a427520 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -44,7 +44,5 @@ class StoreEntry;
 /* MD5 cache keys */
 typedef unsigned char cache_key;
 
-/*Use uint64_t to store miliseconds*/
-typedef uint64_t time_msec_t;
 #endif /* SQUID_TYPEDEFS_H */