From: Willy Tarreau Date: Tue, 2 Jun 2020 16:15:32 +0000 (+0200) Subject: REORG: include: move common/ticks.h to haproxy/ticks.h X-Git-Tag: v2.2-dev9~101 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2f7c5895ce2c0bbcd9bda4f26e38e6b612d8c13;p=thirdparty%2Fhaproxy.git 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 7fd0bbab26..52344ae256 100644 --- 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 @@ -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 d343c02762..8e19562d03 100644 --- a/include/proto/channel.h +++ b/include/proto/channel.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/proto/fd.h b/include/proto/fd.h index 2d45e0666c..6544239159 100644 --- a/include/proto/fd.h +++ b/include/proto/fd.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/proto/peers.h b/include/proto/peers.h index 02fc67d69d..40a9b7e2b0 100644 --- a/include/proto/peers.h +++ b/include/proto/peers.h @@ -23,7 +23,7 @@ #define _PROTO_PEERS_H #include -#include +#include #include #include #include diff --git a/include/proto/proxy.h b/include/proto/proxy.h index e1da0f58f5..caf1c86547 100644 --- a/include/proto/proxy.h +++ b/include/proto/proxy.h @@ -23,7 +23,7 @@ #define _PROTO_PROXY_H #include -#include +#include #include #include #include diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h index eab3800b82..1a5a13d0f8 100644 --- a/include/proto/stick_table.h +++ b/include/proto/stick_table.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/proto/task.h b/include/proto/task.h index 5a3d0210de..c928a11c0f 100644 --- a/include/proto/task.h +++ b/include/proto/task.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/backend.c b/src/backend.c index 9f87a3c0b8..a002bbe0ae 100644 --- a/src/backend.c +++ b/src/backend.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/cli.c b/src/cli.c index b9a23692a5..00cf507780 100644 --- a/src/cli.c +++ b/src/cli.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/dns.c b/src/dns.c index 20ccc6dee2..0390212060 100644 --- a/src/dns.c +++ b/src/dns.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/ev_epoll.c b/src/ev_epoll.c index 4ddf8c5738..65ff1b50da 100644 --- a/src/ev_epoll.c +++ b/src/ev_epoll.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/ev_evports.c b/src/ev_evports.c index b65c18e3be..9f3158ae0f 100644 --- a/src/ev_evports.c +++ b/src/ev_evports.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c index ee8802051c..95a6897faf 100644 --- a/src/ev_kqueue.c +++ b/src/ev_kqueue.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/ev_poll.c b/src/ev_poll.c index 0d0c147d0f..0d0fcaa92a 100644 --- a/src/ev_poll.c +++ b/src/ev_poll.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/ev_select.c b/src/ev_select.c index c1e3edf6da..c6c3f438c7 100644 --- a/src/ev_select.c +++ b/src/ev_select.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/src/raw_sock.c b/src/raw_sock.c index faa8e1e972..744544b23f 100644 --- a/src/raw_sock.c +++ b/src/raw_sock.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/ssl_sock.c b/src/ssl_sock.c index e89fa5ae65..476469f3dd 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/stats.c b/src/stats.c index 0869d54991..b5f5e9c89b 100644 --- a/src/stats.c +++ b/src/stats.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/stream_interface.c b/src/stream_interface.c index d0f5f1abee..dbd9cdfe35 100644 --- a/src/stream_interface.c +++ b/src/stream_interface.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/tcp_rules.c b/src/tcp_rules.c index f79d2a3f78..c08d716a78 100644 --- a/src/tcp_rules.c +++ b/src/tcp_rules.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include