CLEANUP: tree-wide: remove unneeded include time.h in ~20 files

20 files used to have haproxy/time.h included only for now_ms, and two
were missing it for other things but used to inherit from it via other
files.

diff --git a/include/haproxy/channel.h b/include/haproxy/channel.h
index f263b88c12bedefe51b501fbc73e245420c6b30b..0f6e9e0fd696811cd8d6cb8666887a1e378dd433 100644 (file)
--- a/include/haproxy/channel.h
+++ b/include/haproxy/channel.h
@@ -31,7 +31,6 @@
 #include <haproxy/stream_interface-t.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 #include <haproxy/tools-t.h>
 
 

diff --git a/include/haproxy/freq_ctr.h b/include/haproxy/freq_ctr.h
index b2da7adb5ad872c05bf070e0e84bcad771b3382e..e0f50809dde5f6b13fa1ac6e933c0a3aaa02d7a8 100644 (file)
--- a/include/haproxy/freq_ctr.h
+++ b/include/haproxy/freq_ctr.h
@@ -26,7 +26,6 @@
 #include <haproxy/freq_ctr-t.h>
 #include <haproxy/intops.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 
 /* exported functions from freq_ctr.c */
 ullong freq_ctr_total(const struct freq_ctr *ctr, uint period, int pend);

diff --git a/include/haproxy/peers.h b/include/haproxy/peers.h
index d5e5765b29db1a8402147c238b2d074f45ef171f..c5918690d62c032ac6fa5751ab7fe980f3743f1a 100644 (file)
--- a/include/haproxy/peers.h
+++ b/include/haproxy/peers.h
@@ -29,7 +29,6 @@
 #include <haproxy/proxy-t.h>
 #include <haproxy/stick_table-t.h>
 #include <haproxy/stream-t.h>
-#include <haproxy/time.h>
 
 
 extern struct peers *cfg_peers;

diff --git a/include/haproxy/proxy.h b/include/haproxy/proxy.h
index c7bc2c533594f581ccc4ccc0f66a3e0dcf7689cf..e47a577fed0b7ee59f8b50864d2266b760e81403 100644 (file)
--- a/include/haproxy/proxy.h
+++ b/include/haproxy/proxy.h
@@ -30,7 +30,6 @@
 #include <haproxy/proxy-t.h>
 #include <haproxy/server-t.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 
 extern struct proxy *proxies_list;
 extern struct eb_root used_proxy_id;   /* list of proxy IDs in use */

diff --git a/include/haproxy/quic_loss.h b/include/haproxy/quic_loss.h
index ca7a0261031ea01abfc54d301306d0c8ecd6108b..441d478cb9d0efecd24e58dc9f3f6ce47f8f9d05 100644 (file)
--- a/include/haproxy/quic_loss.h
+++ b/include/haproxy/quic_loss.h
@@ -27,7 +27,6 @@
 #endif
 
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 #include <haproxy/xprt_quic-t.h>
 
 #include <haproxy/trace.h>

diff --git a/include/haproxy/stick_table.h b/include/haproxy/stick_table.h
index ff172f45845dc90082c11f25a2adbb0566c1003f..d5a56d11bf1c7ee8b0c3423e9e00e393c16cfc38 100644 (file)
--- a/include/haproxy/stick_table.h
+++ b/include/haproxy/stick_table.h
@@ -30,7 +30,6 @@
 #include <haproxy/sample-t.h>
 #include <haproxy/stick_table-t.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 
 extern struct stktable *stktables_list;
 extern struct stktable_type stktable_types[];

diff --git a/include/haproxy/task.h b/include/haproxy/task.h
index 6adba48458fbdbe561ca31b8a29b79b5c2dc1bb6..e82c1db697dd4e7e185b38ed17e9a9b9cba7f477 100644 (file)
--- a/include/haproxy/task.h
+++ b/include/haproxy/task.h
@@ -37,6 +37,7 @@
 #include <haproxy/task-t.h>
 #include <haproxy/thread.h>
 #include <haproxy/ticks.h>
+#include <haproxy/time.h>
 
 
 /* Principle of the wait queue.

diff --git a/include/haproxy/xprt_quic.h b/include/haproxy/xprt_quic.h
index aa0331f7b1a7180ee8b4dfbb3d4a7a2d81ddb587..bd20d46f280696638e02ba29f16bacc41ba89c33 100644 (file)
--- a/include/haproxy/xprt_quic.h
+++ b/include/haproxy/xprt_quic.h
@@ -33,7 +33,6 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 
 #include <haproxy/listener.h>
 #include <haproxy/quic_cc.h>

diff --git a/src/extcheck.c b/src/extcheck.c
index e621918a8d556dd6367eb5f0f1fc56b2d5b93232..5b0d3e9675c9a8fb0a776fb2059bf29988d94917 100644 (file)
--- a/src/extcheck.c
+++ b/src/extcheck.c
@@ -39,7 +39,6 @@
 #include <haproxy/stream-t.h>
 #include <haproxy/task.h>
 #include <haproxy/thread.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 
 

diff --git a/src/freq_ctr.c b/src/freq_ctr.c
index edea699a751a5847decac94a2df67c4ce20c00cf..54aa78f02ad69e2b983c519a73e1ddccee7de55d 100644 (file)
--- a/src/freq_ctr.c
+++ b/src/freq_ctr.c
@@ -12,7 +12,6 @@
 
 #include <haproxy/api.h>
 #include <haproxy/freq_ctr.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 
 /* Returns the total number of events over the current + last period, including

diff --git a/src/frontend.c b/src/frontend.c
index a8ed2c4884fdfce31b6b1ee59b6dbab59dba3236..6aa1027013a5560a5ea5a69bde662a344d0a4907 100644 (file)
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -37,7 +37,7 @@
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
-#include <haproxy/time.h>
+#include <haproxy/ticks.h>
 #include <haproxy/tools.h>
 
 

diff --git a/src/listener.c b/src/listener.c
index be467ea5d832bee1a7493dbafadebeb8697bd916..0ba2ce6e54065ff328d5c0b8b568546fdec1cc55 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -35,7 +35,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
-#include <haproxy/time.h>
+#include <haproxy/ticks.h>
 #include <haproxy/tools.h>
 
 

diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index 0357552baa719dc59ad2af6e5715aa3ae223969f..216700b40dde8910a97a1537fb94f3cd666aa094 100644 (file)
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -38,7 +38,6 @@
 #include <haproxy/protocol.h>
 #include <haproxy/proto_sockpair.h>
 #include <haproxy/sock.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index dfc52b137e79782e44898c51dc51bdc7d567994a..47a9992435a115b72a2464166cf2d1f24c821861 100644 (file)
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -36,7 +36,6 @@
 #include <haproxy/proto_uxst.h>
 #include <haproxy/sock.h>
 #include <haproxy/sock_unix.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 

diff --git a/src/raw_sock.c b/src/raw_sock.c
index a078f2d11a1d78c4ab046d88b73345acfd2eb44a..7ee5f9bc7f61d723be436719b7ccf43ce20bdd7f 100644 (file)
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -30,8 +30,6 @@
 #include <haproxy/global.h>
 #include <haproxy/pipe.h>
 #include <haproxy/stream_interface.h>
-#include <haproxy/ticks.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 
 

diff --git a/src/sample.c b/src/sample.c
index 8fcacb1283cf6dee505af1bd730a71edc6bcae44..bda590875c457c029ecf98f57c46dc180587ea6a 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -39,6 +39,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/sink.h>
 #include <haproxy/stick_table.h>
+#include <haproxy/time.h>
 #include <haproxy/tools.h>
 #include <haproxy/uri_auth-t.h>
 #include <haproxy/vars.h>

diff --git a/src/stick_table.c b/src/stick_table.c
index f5d76322c4dcf4471bf3db605d2e449c80c434d6..4bc1a217dfd1c3f10c006eb11ce69c6f552642c9 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -40,7 +40,7 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
-#include <haproxy/time.h>
+#include <haproxy/ticks.h>
 #include <haproxy/tools.h>
 
 

diff --git a/src/stream_interface.c b/src/stream_interface.c
index 2406261749655083659d5a83ee99a3405601be60..b55515901c63dd9a598a712e00d7f52264c69825 100644 (file)
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -33,7 +33,6 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 
 

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index f525895360630b885f553b60f1a277a42d4c14e9..9af3005c449574b38290e3e94c4126be5e8f5426 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -27,7 +27,6 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 #include <haproxy/trace.h>
 

diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index ba8a82aba4bbd2a0e62cd10cdc257cdcf161a244..6109f5afe3a5c67a27baef731e656b467fec131e 100644 (file)
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -57,7 +57,7 @@
 #include <haproxy/ssl_sock.h>
 #include <haproxy/task.h>
 #include <haproxy/tcpcheck.h>
-#include <haproxy/time.h>
+#include <haproxy/ticks.h>
 #include <haproxy/tools.h>
 #include <haproxy/trace.h>
 #include <haproxy/vars.h>

diff --git a/src/wdt.c b/src/wdt.c
index 3c0b3d19e9ac959f9aa8a1cffd6a114362a87315..c42c4f7a07bfd7228d8cf896d59bdafa304993b2 100644 (file)
--- a/src/wdt.c
+++ b/src/wdt.c
@@ -18,6 +18,7 @@
 #include <haproxy/global.h>
 #include <haproxy/signal-t.h>
 #include <haproxy/thread.h>
+#include <haproxy/time.h>
 #include <haproxy/tools.h>
 
 

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 32b8fced2dc8479ea4425d7605cd52ce6bc36db0..802e5702b48c62b2053dc3f28d47cc7a08cf13ab 100644 (file)
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -28,7 +28,6 @@
 #include <haproxy/debug.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 
 #include <haproxy/connection.h>
 #include <haproxy/fd.h>