REORG: include: move common/ticks.h to haproxy/ticks.h

Nothing needed to be changed, there are no exported types.

diff --git a/include/common/ticks.h b/include/haproxy/ticks.h
similarity index 80%
rename from include/common/ticks.h
rename to include/haproxy/ticks.h
index 7fd0bbab26c953629de915f71121c23695783001..52344ae256107c942d03a77584174351d2fa0030 100644 (file)
--- a/include/common/ticks.h
+++ b/include/haproxy/ticks.h
@@ -1,23 +1,23 @@
 /*
-  include/common/ticks.h
-  Functions and macros for manipulation of expiration timers
-
-  Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
-  
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1
-  exclusively.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * include/haproxy/ticks.h
+ * Functions and macros for manipulation of expiration timers
+ *
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, version 2.1
+ * exclusively.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 /*
  * Using a mix of milliseconds and timeval for internal timers is expensive and
@@ -49,8 +49,8 @@
  * the dedicated tick_add() function.
  */
 
-#ifndef _COMMON_TICKS_H
-#define _COMMON_TICKS_H
+#ifndef _HAPROXY_TICKS_H
+#define _HAPROXY_TICKS_H
 
 #include <haproxy/api.h>
 
@@ -143,7 +143,7 @@ static inline int tick_remain(int now, int exp)
        return exp - now;
 }
 
-#endif /* _COMMON_TICKS_H */
+#endif /* _HAPROXY_TICKS_H */
 
 /*
  * Local variables:

diff --git a/include/proto/channel.h b/include/proto/channel.h
index d343c027626a000c547bf95fbf7ca572a88d04ff..8e19562d03a2c4126fd17b9bbf5a6877632b612a 100644 (file)
--- a/include/proto/channel.h
+++ b/include/proto/channel.h
@@ -31,7 +31,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/dynbuf.h>
 #include <common/htx.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/channel.h>

diff --git a/include/proto/fd.h b/include/proto/fd.h
index 2d45e0666c1e6bd91a28836e8da73ce8e238040f..65442391598d5613a099c17a35885a0e81de4499 100644 (file)
--- a/include/proto/fd.h
+++ b/include/proto/fd.h
@@ -28,7 +28,7 @@
 #include <unistd.h>
 
 #include <haproxy/api.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <types/fd.h>
 #include <haproxy/activity.h>

diff --git a/include/proto/peers.h b/include/proto/peers.h
index 02fc67d69d5255673ceda51839fb297650825b61..40a9b7e2b00c715e179b462b33115fb04adb834a 100644 (file)
--- a/include/proto/peers.h
+++ b/include/proto/peers.h
@@ -23,7 +23,7 @@
 #define _PROTO_PEERS_H
 
 #include <haproxy/api.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <proto/connection.h>
 #include <types/stream.h>

diff --git a/include/proto/proxy.h b/include/proto/proxy.h
index e1da0f58f59331e48bd7aeb71e1df9afcf2e7024..caf1c86547b8132c60ce51938a1564c12e2a1665 100644 (file)
--- a/include/proto/proxy.h
+++ b/include/proto/proxy.h
@@ -23,7 +23,7 @@
 #define _PROTO_PROXY_H
 
 #include <haproxy/api.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <types/applet.h>
 #include <types/global.h>

diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h
index eab3800b82a40d4237a3098c2723b1bccbe4efc2..1a5a13d0f8db83272daa435eebe299e6aed1f41a 100644 (file)
--- a/include/proto/stick_table.h
+++ b/include/proto/stick_table.h
@@ -25,7 +25,7 @@
 
 #include <haproxy/errors.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <types/stick_table.h>
 #include <types/dict.h>

diff --git a/include/proto/task.h b/include/proto/task.h
index 5a3d0210de5709cb1666b37ef565995c1fd74f1a..c928a11c0fe0666a92e42f57d29ec1232d2a35cf 100644 (file)
--- a/include/proto/task.h
+++ b/include/proto/task.h
@@ -29,7 +29,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/intops.h>
 #include <haproxy/list.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/thread.h>
 
 #include <import/eb32sctree.h>

diff --git a/src/backend.c b/src/backend.c
index 9f87a3c0b8af17b483ac5eea38dcca557c6e11d4..a002bbe0ae5d3174183d6f9cfea8d12cfa35569e 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -22,7 +22,7 @@
 #include <haproxy/api.h>
 #include <haproxy/hash.h>
 #include <common/htx.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <haproxy/namespace.h>
 

diff --git a/src/cli.c b/src/cli.c
index b9a23692a52e5941d74681837298156e26f3df07..00cf50778022f7be8172562e26615a832ae9e2df 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -30,7 +30,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/list.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <common/uri_auth.h>
 #include <haproxy/version.h>

diff --git a/src/dns.c b/src/dns.c
index 20ccc6dee2b700e712938072324beb0684615636..0390212060af78bd1c80d36111ef801bb8df643a 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -23,7 +23,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
 #include <haproxy/time.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/net_helper.h>
 
 #include <types/action.h>

diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index 4ddf8c5738c1af05131a07bf80b30088a070bd16..65ff1b50dae88191b44b69e4017527f82fa99ea7 100644 (file)
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -17,7 +17,7 @@
 #include <haproxy/api.h>
 #include <haproxy/thread-t.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/global.h>

diff --git a/src/ev_evports.c b/src/ev_evports.c
index b65c18e3be5db6e23a0c778be6b9277c73e94fae..9f3158ae0ff27a05624d53796176f3a08ada6979 100644 (file)
--- a/src/ev_evports.c
+++ b/src/ev_evports.c
@@ -20,7 +20,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/thread-t.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/global.h>

diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c
index ee8802051cb8af1c64961a35ac739ae479b0e1bb..95a6897faf81bea4c31b0c8e5e687f1fd59008e7 100644 (file)
--- a/src/ev_kqueue.c
+++ b/src/ev_kqueue.c
@@ -19,7 +19,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/thread-t.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/global.h>

diff --git a/src/ev_poll.c b/src/ev_poll.c
index 0d0c147d0fc35c6c4d4f243daa139ee390534634..0d0fcaa92a0696b7c0139c5749e1f96a1107115c 100644 (file)
--- a/src/ev_poll.c
+++ b/src/ev_poll.c
@@ -19,7 +19,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/thread-t.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/global.h>

diff --git a/src/ev_select.c b/src/ev_select.c
index c1e3edf6da1de64455aec768d498c00e31c35926..c6c3f438c7c19beada673316c81f53159a6430b3 100644 (file)
--- a/src/ev_select.c
+++ b/src/ev_select.c
@@ -16,7 +16,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/thread-t.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/global.h>

diff --git a/src/raw_sock.c b/src/raw_sock.c
index faa8e1e97241d814d004cfd4e9b432387f283288..744544b23fd121175ffe40d4fc5141f147ce4630 100644 (file)
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -25,7 +25,7 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <proto/connection.h>

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index e89fa5ae65840348c0b415d7ac7dcc113affb37a..476469f3dd2edb2943f512eac41cc72694f68f32 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -49,7 +49,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/openssl-compat.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <haproxy/base64.h>
 

diff --git a/src/stats.c b/src/stats.c
index 0869d5499101d500c4236144dd00e66739b3d10e..b5f5e9c89b0ddb2f6756d62e96961d0b17eeb3ab 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -32,7 +32,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <common/uri_auth.h>
 #include <haproxy/version.h>

diff --git a/src/stream_interface.c b/src/stream_interface.c
index d0f5f1abee2564369edb1f8859f59f2a7fcff269..dbd9cdfe35817250074f361d76e79b88925a487b 100644 (file)
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -22,7 +22,7 @@
 #include <haproxy/api.h>
 #include <haproxy/dynbuf.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <proto/applet.h>

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index f79d2a3f7893ac95da71d227a548abd438b18c97..c08d716a78f24733b38c33d8cc4629f0c35edcda 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -13,7 +13,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/list.h>
 #include <common/standard.h>
-#include <common/ticks.h>
+#include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/arg.h>