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

Nothing needed to be changed, there are no exported types.
This commit is contained in:
Willy Tarreau 2020-06-02 18:15:32 +02:00
parent 374b442cbc
commit c2f7c5895c
20 changed files with 41 additions and 41 deletions

View File

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

View File

@ -31,7 +31,7 @@
#include <haproxy/chunk.h> #include <haproxy/chunk.h>
#include <haproxy/dynbuf.h> #include <haproxy/dynbuf.h>
#include <common/htx.h> #include <common/htx.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <types/channel.h> #include <types/channel.h>

View File

@ -28,7 +28,7 @@
#include <unistd.h> #include <unistd.h>
#include <haproxy/api.h> #include <haproxy/api.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <types/fd.h> #include <types/fd.h>
#include <haproxy/activity.h> #include <haproxy/activity.h>

View File

@ -23,7 +23,7 @@
#define _PROTO_PEERS_H #define _PROTO_PEERS_H
#include <haproxy/api.h> #include <haproxy/api.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <proto/connection.h> #include <proto/connection.h>
#include <types/stream.h> #include <types/stream.h>

View File

@ -23,7 +23,7 @@
#define _PROTO_PROXY_H #define _PROTO_PROXY_H
#include <haproxy/api.h> #include <haproxy/api.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <types/applet.h> #include <types/applet.h>
#include <types/global.h> #include <types/global.h>

View File

@ -25,7 +25,7 @@
#include <haproxy/errors.h> #include <haproxy/errors.h>
#include <common/standard.h> #include <common/standard.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <types/stick_table.h> #include <types/stick_table.h>
#include <types/dict.h> #include <types/dict.h>

View File

@ -29,7 +29,7 @@
#include <haproxy/pool.h> #include <haproxy/pool.h>
#include <haproxy/intops.h> #include <haproxy/intops.h>
#include <haproxy/list.h> #include <haproxy/list.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/thread.h> #include <haproxy/thread.h>
#include <import/eb32sctree.h> #include <import/eb32sctree.h>

View File

@ -22,7 +22,7 @@
#include <haproxy/api.h> #include <haproxy/api.h>
#include <haproxy/hash.h> #include <haproxy/hash.h>
#include <common/htx.h> #include <common/htx.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <haproxy/namespace.h> #include <haproxy/namespace.h>

View File

@ -30,7 +30,7 @@
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <haproxy/list.h> #include <haproxy/list.h>
#include <common/standard.h> #include <common/standard.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <common/uri_auth.h> #include <common/uri_auth.h>
#include <haproxy/version.h> #include <haproxy/version.h>

View File

@ -23,7 +23,7 @@
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <haproxy/errors.h> #include <haproxy/errors.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/net_helper.h> #include <haproxy/net_helper.h>
#include <types/action.h> #include <types/action.h>

View File

@ -17,7 +17,7 @@
#include <haproxy/api.h> #include <haproxy/api.h>
#include <haproxy/thread-t.h> #include <haproxy/thread-t.h>
#include <common/standard.h> #include <common/standard.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <types/global.h> #include <types/global.h>

View File

@ -20,7 +20,7 @@
#include <haproxy/api.h> #include <haproxy/api.h>
#include <haproxy/thread-t.h> #include <haproxy/thread-t.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <types/global.h> #include <types/global.h>

View File

@ -19,7 +19,7 @@
#include <haproxy/api.h> #include <haproxy/api.h>
#include <haproxy/thread-t.h> #include <haproxy/thread-t.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <types/global.h> #include <types/global.h>

View File

@ -19,7 +19,7 @@
#include <haproxy/api.h> #include <haproxy/api.h>
#include <haproxy/thread-t.h> #include <haproxy/thread-t.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <types/global.h> #include <types/global.h>

View File

@ -16,7 +16,7 @@
#include <haproxy/api.h> #include <haproxy/api.h>
#include <haproxy/thread-t.h> #include <haproxy/thread-t.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <types/global.h> #include <types/global.h>

View File

@ -25,7 +25,7 @@
#include <haproxy/api.h> #include <haproxy/api.h>
#include <haproxy/buf.h> #include <haproxy/buf.h>
#include <common/standard.h> #include <common/standard.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <proto/connection.h> #include <proto/connection.h>

View File

@ -49,7 +49,7 @@
#include <haproxy/errors.h> #include <haproxy/errors.h>
#include <haproxy/openssl-compat.h> #include <haproxy/openssl-compat.h>
#include <common/standard.h> #include <common/standard.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <haproxy/base64.h> #include <haproxy/base64.h>

View File

@ -32,7 +32,7 @@
#include <haproxy/pool.h> #include <haproxy/pool.h>
#include <haproxy/list.h> #include <haproxy/list.h>
#include <common/standard.h> #include <common/standard.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <common/uri_auth.h> #include <common/uri_auth.h>
#include <haproxy/version.h> #include <haproxy/version.h>

View File

@ -22,7 +22,7 @@
#include <haproxy/api.h> #include <haproxy/api.h>
#include <haproxy/dynbuf.h> #include <haproxy/dynbuf.h>
#include <common/standard.h> #include <common/standard.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <proto/applet.h> #include <proto/applet.h>

View File

@ -13,7 +13,7 @@
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <haproxy/list.h> #include <haproxy/list.h>
#include <common/standard.h> #include <common/standard.h>
#include <common/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
#include <types/arg.h> #include <types/arg.h>