From 853b297c9b82e5db58826b07a4438c627b55b04c Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 27 May 2020 18:01:47 +0200 Subject: [PATCH] REORG: include: split mini-clist into haproxy/list and list-t.h Half of the users of this include only need the type definitions and not the manipulation macros nor the inline functions. Moves the various types into mini-clist-t.h makes the files cleaner. The other one had all its includes grouped at the top. A few files continued to reference it without using it and were cleaned. In addition it was about time that we'd rename that file, it's not "mini" anymore and contains a bit more than just circular lists. --- contrib/hpack/decode.c | 1 - contrib/mod_defender/spoa.c | 2 +- contrib/modsecurity/spoa.c | 2 +- .../prometheus-exporter/service-prometheus.c | 2 +- include/common/cfgparse.h | 2 +- include/common/memory.h | 2 +- include/haproxy/list-t.h | 73 +++++++++++++++++++ .../{common/mini-clist.h => haproxy/list.h} | 66 +++-------------- include/proto/applet.h | 2 +- include/proto/http_rules.h | 2 +- include/proto/queue.h | 1 - include/proto/shctx.h | 2 +- include/proto/sink.h | 2 +- include/proto/task.h | 2 +- include/proto/trace.h | 2 +- include/types/acl.h | 2 +- include/types/arg.h | 2 +- include/types/auth.h | 2 +- include/types/checks.h | 2 +- include/types/cli.h | 2 +- include/types/dns.h | 2 +- include/types/fcgi-app.h | 2 +- include/types/filters.h | 2 +- include/types/listener.h | 2 +- include/types/log.h | 2 +- include/types/pattern.h | 2 +- include/types/peers.h | 2 +- include/types/protocol.h | 2 +- include/types/proxy.h | 2 +- include/types/queue.h | 2 +- include/types/sample.h | 2 +- include/types/server.h | 2 +- include/types/session.h | 2 +- include/types/signal.h | 2 +- include/types/spoe.h | 2 +- include/types/ssl_ckch.h | 2 +- include/types/ssl_crtlist.h | 2 +- include/types/ssl_sock.h | 2 +- include/types/stream.h | 2 +- include/types/task.h | 2 +- include/types/trace.h | 2 +- include/types/vars.h | 2 +- src/acl.c | 2 +- src/action.c | 2 +- src/applet.c | 2 +- src/checks.c | 2 +- src/cli.c | 2 +- src/flt_http_comp.c | 2 +- src/haproxy.c | 2 +- src/listener.c | 2 +- src/memory.c | 2 +- src/mux_fcgi.c | 2 +- src/mworker.c | 2 +- src/proto_sockpair.c | 2 +- src/proto_tcp.c | 2 +- src/proto_uxst.c | 2 +- src/protocol.c | 2 +- src/shctx.c | 2 +- src/sink.c | 2 +- src/stats.c | 2 +- src/stick_table.c | 2 +- src/task.c | 2 +- src/tcp_rules.c | 2 +- src/trace.c | 2 +- src/vars.c | 2 +- tests/test-list.c | 2 +- 66 files changed, 145 insertions(+), 120 deletions(-) create mode 100644 include/haproxy/list-t.h rename include/{common/mini-clist.h => haproxy/list.h} (94%) diff --git a/contrib/hpack/decode.c b/contrib/hpack/decode.c index ce3b48491..8dbb6f1f4 100644 --- a/contrib/hpack/decode.c +++ b/contrib/hpack/decode.c @@ -20,7 +20,6 @@ #include #include #include -#include #define MAX_RQ_SIZE 65536 #define MAX_HDR_NUM 1000 diff --git a/contrib/mod_defender/spoa.c b/contrib/mod_defender/spoa.c index 079e880cb..530b42d06 100644 --- a/contrib/mod_defender/spoa.c +++ b/contrib/mod_defender/spoa.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/contrib/modsecurity/spoa.c b/contrib/modsecurity/spoa.c index 20916fdf3..ded8a6fa9 100644 --- a/contrib/modsecurity/spoa.c +++ b/contrib/modsecurity/spoa.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c index a31aa153c..6afa43feb 100644 --- a/contrib/prometheus-exporter/service-prometheus.c +++ b/contrib/prometheus-exporter/service-prometheus.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include diff --git a/include/common/cfgparse.h b/include/common/cfgparse.h index 8ecb7714a..86f87bf42 100644 --- a/include/common/cfgparse.h +++ b/include/common/cfgparse.h @@ -23,7 +23,7 @@ #define _COMMON_CFGPARSE_H #include -#include +#include #include #include diff --git a/include/common/memory.h b/include/common/memory.h index 8b03daf8e..d80b4868c 100644 --- a/include/common/memory.h +++ b/include/common/memory.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include /* On architectures supporting threads and double-word CAS, we can implement diff --git a/include/haproxy/list-t.h b/include/haproxy/list-t.h new file mode 100644 index 000000000..dd8493eed --- /dev/null +++ b/include/haproxy/list-t.h @@ -0,0 +1,73 @@ +/* + * include/haproxy/list-t.h + * Circular list manipulation types definitions + * + * Copyright (C) 2002-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 + */ + +#ifndef _HAPROXY_LIST_T_H +#define _HAPROXY_LIST_T_H + + +/* these are circular or bidirectionnal lists only. Each list pointer points to + * another list pointer in a structure, and not the structure itself. The + * pointer to the next element MUST be the first one so that the list is easily + * cast as a single linked list or pointer. + */ +struct list { + struct list *n; /* next */ + struct list *p; /* prev */ +}; + +/* This is similar to struct list, but we want to be sure the compiler will + * yell at you if you use macroes for one when you're using the other. You have + * to expicitely cast if that's really what you want to do. + */ +struct mt_list { + struct mt_list *next; + struct mt_list *prev; +}; + + +/* a back-ref is a pointer to a target list entry. It is used to detect when an + * element being deleted is currently being tracked by another user. The best + * example is a user dumping the session table. The table does not fit in the + * output buffer so we have to set a mark on a session and go on later. But if + * that marked session gets deleted, we don't want the user's pointer to go in + * the wild. So we can simply link this user's request to the list of this + * session's users, and put a pointer to the list element in ref, that will be + * used as the mark for next iteration. + */ +struct bref { + struct list users; + struct list *ref; /* pointer to the target's list entry */ +}; + +/* a word list is a generic list with a pointer to a string in each element. */ +struct wordlist { + struct list list; + char *s; +}; + +/* this is the same as above with an additional pointer to a condition. */ +struct cond_wordlist { + struct list list; + void *cond; + char *s; +}; + +#endif /* _HAPROXY_LIST_T_H */ diff --git a/include/common/mini-clist.h b/include/haproxy/list.h similarity index 94% rename from include/common/mini-clist.h rename to include/haproxy/list.h index 188d118ac..0281aa1a4 100644 --- a/include/common/mini-clist.h +++ b/include/haproxy/list.h @@ -1,8 +1,8 @@ /* - * include/common/mini-clist.h - * Circular list manipulation macros and structures. + * include/haproxy/list.h + * Circular list manipulation macros and functions. * - * Copyright (C) 2002-2014 Willy Tarreau - w@1wt.eu + * Copyright (C) 2002-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 @@ -19,56 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _COMMON_MINI_CLIST_H -#define _COMMON_MINI_CLIST_H +#ifndef _HAPROXY_LIST_H +#define _HAPROXY_LIST_H - -/* these are circular or bidirectionnal lists only. Each list pointer points to - * another list pointer in a structure, and not the structure itself. The - * pointer to the next element MUST be the first one so that the list is easily - * cast as a single linked list or pointer. - */ -struct list { - struct list *n; /* next */ - struct list *p; /* prev */ -}; - -/* This is similar to struct list, but we want to be sure the compiler will - * yell at you if you use macroes for one when you're using the other. You have - * to expicitely cast if that's really what you want to do. - */ -struct mt_list { - struct mt_list *next; - struct mt_list *prev; -}; - - -/* a back-ref is a pointer to a target list entry. It is used to detect when an - * element being deleted is currently being tracked by another user. The best - * example is a user dumping the session table. The table does not fit in the - * output buffer so we have to set a mark on a session and go on later. But if - * that marked session gets deleted, we don't want the user's pointer to go in - * the wild. So we can simply link this user's request to the list of this - * session's users, and put a pointer to the list element in ref, that will be - * used as the mark for next iteration. - */ -struct bref { - struct list users; - struct list *ref; /* pointer to the target's list entry */ -}; - -/* a word list is a generic list with a pointer to a string in each element. */ -struct wordlist { - struct list list; - char *s; -}; - -/* this is the same as above with an additional pointer to a condition. */ -struct cond_wordlist { - struct list list; - void *cond; - char *s; -}; +#include +#include +#include /* First undefine some macros which happen to also be defined on OpenBSD, * in sys/queue.h, used by sys/event.h @@ -257,15 +213,13 @@ struct cond_wordlist { &item->member != (list_head); \ item = back, back = LIST_ELEM(back->member.p, typeof(back), member)) -#include -#include -#define MT_LIST_BUSY ((struct mt_list *)1) /* * Locked version of list manipulation macros. * It is OK to use those concurrently from multiple threads, as long as the * list is only used with the locked variants. */ +#define MT_LIST_BUSY ((struct mt_list *)1) /* * Add an item at the beginning of a list. @@ -733,4 +687,4 @@ static __inline struct mt_list *list_to_mt_list(struct list *list) } -#endif /* _COMMON_MINI_CLIST_H */ +#endif /* _HAPROXY_LIST_H */ diff --git a/include/proto/applet.h b/include/proto/applet.h index ea8bc0baf..aaa49038b 100644 --- a/include/proto/applet.h +++ b/include/proto/applet.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/include/proto/http_rules.h b/include/proto/http_rules.h index 27c4b6a8f..84f302dce 100644 --- a/include/proto/http_rules.h +++ b/include/proto/http_rules.h @@ -23,7 +23,7 @@ #define _PROTO_HTTP_RULES_H #include -#include +#include #include #include diff --git a/include/proto/queue.h b/include/proto/queue.h index 8ef9179e6..9bec9b42b 100644 --- a/include/proto/queue.h +++ b/include/proto/queue.h @@ -24,7 +24,6 @@ #include #include -#include #include #include diff --git a/include/proto/shctx.h b/include/proto/shctx.h index 25bf377f2..76f498f53 100644 --- a/include/proto/shctx.h +++ b/include/proto/shctx.h @@ -14,7 +14,7 @@ #ifndef SHCTX_H #define SHCTX_H -#include +#include #include #include diff --git a/include/proto/sink.h b/include/proto/sink.h index d30f30a74..c0c75c30f 100644 --- a/include/proto/sink.h +++ b/include/proto/sink.h @@ -22,7 +22,7 @@ #ifndef _PROTO_SINK_H #define _PROTO_SINK_H -#include +#include #include extern struct list sink_list; diff --git a/include/proto/task.h b/include/proto/task.h index a42431a17..944ada50a 100644 --- a/include/proto/task.h +++ b/include/proto/task.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/proto/trace.h b/include/proto/trace.h index f43faf5a9..144794057 100644 --- a/include/proto/trace.h +++ b/include/proto/trace.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/types/acl.h b/include/types/acl.h index 748f3611b..7afa3d870 100644 --- a/include/types/acl.h +++ b/include/types/acl.h @@ -23,7 +23,7 @@ #define _TYPES_ACL_H #include -#include +#include #include #include diff --git a/include/types/arg.h b/include/types/arg.h index 60fd007e5..366c09e09 100644 --- a/include/types/arg.h +++ b/include/types/arg.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/include/types/auth.h b/include/types/auth.h index c10aced5b..f9b56f1ad 100644 --- a/include/types/auth.h +++ b/include/types/auth.h @@ -14,7 +14,7 @@ #define _TYPES_AUTH_H #include -#include +#include #include diff --git a/include/types/checks.h b/include/types/checks.h index 6d07c9a55..3ea4a0638 100644 --- a/include/types/checks.h +++ b/include/types/checks.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/include/types/cli.h b/include/types/cli.h index 8a4412415..41753c522 100644 --- a/include/types/cli.h +++ b/include/types/cli.h @@ -20,7 +20,7 @@ #ifndef _TYPES_CLI_H #define _TYPES_CLI_H -#include +#include #include /* Access level for a stats socket */ diff --git a/include/types/dns.h b/include/types/dns.h index 06afda8b8..84a82190a 100644 --- a/include/types/dns.h +++ b/include/types/dns.h @@ -24,7 +24,7 @@ #include -#include +#include #include #include diff --git a/include/types/fcgi-app.h b/include/types/fcgi-app.h index 7fb20ee6f..c88dda3d0 100644 --- a/include/types/fcgi-app.h +++ b/include/types/fcgi-app.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/types/filters.h b/include/types/filters.h index 5de4eee6e..2e06b8316 100644 --- a/include/types/filters.h +++ b/include/types/filters.h @@ -22,7 +22,7 @@ #define _TYPES_FILTERS_H #include -#include +#include struct http_msg; struct proxy; diff --git a/include/types/listener.h b/include/types/listener.h index 7374dc8f8..431420940 100644 --- a/include/types/listener.h +++ b/include/types/listener.h @@ -30,7 +30,7 @@ #include #endif -#include +#include #include #include diff --git a/include/types/log.h b/include/types/log.h index 2c2ac0298..301c2bf33 100644 --- a/include/types/log.h +++ b/include/types/log.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #define NB_LOG_FACILITIES 24 diff --git a/include/types/pattern.h b/include/types/pattern.h index f1468b3e2..1a3e0766f 100644 --- a/include/types/pattern.h +++ b/include/types/pattern.h @@ -23,7 +23,7 @@ #define _TYPES_PATTERN_H #include -#include +#include #include #include diff --git a/include/types/peers.h b/include/types/peers.h index 74613472a..b3e1e4429 100644 --- a/include/types/peers.h +++ b/include/types/peers.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/include/types/protocol.h b/include/types/protocol.h index edda61c01..0c490682a 100644 --- a/include/types/protocol.h +++ b/include/types/protocol.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include /* some pointer types referenced below */ diff --git a/include/types/proxy.h b/include/types/proxy.h index c75f0b679..f7bdd30ff 100644 --- a/include/types/proxy.h +++ b/include/types/proxy.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/types/queue.h b/include/types/queue.h index b0800f30f..933346894 100644 --- a/include/types/queue.h +++ b/include/types/queue.h @@ -23,7 +23,7 @@ #define _TYPES_QUEUE_H #include -#include +#include #include #include diff --git a/include/types/sample.h b/include/types/sample.h index bb6b0928b..618be08bf 100644 --- a/include/types/sample.h +++ b/include/types/sample.h @@ -28,7 +28,7 @@ #include #include -#include +#include struct arg; diff --git a/include/types/server.h b/include/types/server.h index c8e5bb69b..1737f8069 100644 --- a/include/types/server.h +++ b/include/types/server.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/include/types/session.h b/include/types/session.h index fb6b6212b..57ee52ab8 100644 --- a/include/types/session.h +++ b/include/types/session.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/include/types/signal.h b/include/types/signal.h index 661347a0a..838aefd65 100644 --- a/include/types/signal.h +++ b/include/types/signal.h @@ -17,7 +17,7 @@ #include #include -#include +#include #include /* flags for -> flags */ diff --git a/include/types/spoe.h b/include/types/spoe.h index eaa0ef05c..85f8b430d 100644 --- a/include/types/spoe.h +++ b/include/types/spoe.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/include/types/ssl_ckch.h b/include/types/ssl_ckch.h index a63ec1d1e..a4108104b 100644 --- a/include/types/ssl_ckch.h +++ b/include/types/ssl_ckch.h @@ -33,7 +33,7 @@ #define _TYPES_SSL_CKCH_H #ifdef USE_OPENSSL -#include +#include #include /* This is used to preload the certificate, private key diff --git a/include/types/ssl_crtlist.h b/include/types/ssl_crtlist.h index 2879d745c..ed8c135ae 100644 --- a/include/types/ssl_crtlist.h +++ b/include/types/ssl_crtlist.h @@ -25,7 +25,7 @@ #include -#include +#include /* forward declarations for structures below */ struct bind_conf; diff --git a/include/types/ssl_sock.h b/include/types/ssl_sock.h index be58aa8c2..d62e4ddf9 100644 --- a/include/types/ssl_sock.h +++ b/include/types/ssl_sock.h @@ -33,7 +33,7 @@ #include #include -#include +#include #include /* ***** READ THIS before adding code here! ***** diff --git a/include/types/stream.h b/include/types/stream.h index e450c6340..37bdb96c5 100644 --- a/include/types/stream.h +++ b/include/types/stream.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/include/types/task.h b/include/types/task.h index 01756ead8..fe945df27 100644 --- a/include/types/task.h +++ b/include/types/task.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/include/types/trace.h b/include/types/trace.h index ad9d7b6a0..c119ab33f 100644 --- a/include/types/trace.h +++ b/include/types/trace.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include /* the macros below define an optional type for each of the 4 args passed to diff --git a/include/types/vars.h b/include/types/vars.h index a72469fd1..91fcf0727 100644 --- a/include/types/vars.h +++ b/include/types/vars.h @@ -1,7 +1,7 @@ #ifndef _TYPES_VARS_H #define _TYPES_VARS_H -#include +#include #include #include diff --git a/src/acl.c b/src/acl.c index 5b25fce5a..14a0e0ba6 100644 --- a/src/acl.c +++ b/src/acl.c @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/src/action.c b/src/action.c index 085420813..cb897b66a 100644 --- a/src/action.c +++ b/src/action.c @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/src/applet.c b/src/applet.c index 5f06d6ac1..88be4474e 100644 --- a/src/applet.c +++ b/src/applet.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/checks.c b/src/checks.c index de182db42..5dbbecae4 100644 --- a/src/checks.c +++ b/src/checks.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/cli.c b/src/cli.c index a0118dc2b..4b9c31f97 100644 --- a/src/cli.c +++ b/src/cli.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c index abec6b3bf..9ca51e538 100644 --- a/src/flt_http_comp.c +++ b/src/flt_http_comp.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/haproxy.c b/src/haproxy.c index 79a28acb6..a1dff0c38 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -86,7 +86,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/listener.c b/src/listener.c index a1b6ae455..c035ed841 100644 --- a/src/listener.c +++ b/src/listener.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/memory.c b/src/memory.c index 961a292c2..2caf13d9c 100644 --- a/src/memory.c +++ b/src/memory.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c index 7ff39328c..87c84fb1a 100644 --- a/src/mux_fcgi.c +++ b/src/mux_fcgi.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/mworker.c b/src/mworker.c index 95c06bba1..4b2a7afaf 100644 --- a/src/mworker.c +++ b/src/mworker.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c index c95d5d46f..b6277247f 100644 --- a/src/proto_sockpair.c +++ b/src/proto_sockpair.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/proto_tcp.c b/src/proto_tcp.c index 9233288fd..9d8751537 100644 --- a/src/proto_tcp.c +++ b/src/proto_tcp.c @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/src/proto_uxst.c b/src/proto_uxst.c index 648f3a32f..ae68a8d1d 100644 --- a/src/proto_uxst.c +++ b/src/proto_uxst.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/protocol.c b/src/protocol.c index 3a11bddf6..4909ee14a 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/src/shctx.c b/src/shctx.c index bfca085bb..113828adb 100644 --- a/src/shctx.c +++ b/src/shctx.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include "proto/shctx.h" #if !defined (USE_PRIVATE_CACHE) diff --git a/src/sink.c b/src/sink.c index 7eb283fc6..9ed75aca9 100644 --- a/src/sink.c +++ b/src/sink.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/stats.c b/src/stats.c index 05dc223fb..e7a1e76f6 100644 --- a/src/stats.c +++ b/src/stats.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/stick_table.c b/src/stick_table.c index 37131f6a9..dc2ef4f82 100644 --- a/src/stick_table.c +++ b/src/stick_table.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/task.c b/src/task.c index a116b2e80..fc0978787 100644 --- a/src/task.c +++ b/src/task.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/tcp_rules.c b/src/tcp_rules.c index 0be4ecdf2..194301874 100644 --- a/src/tcp_rules.c +++ b/src/tcp_rules.c @@ -11,7 +11,7 @@ */ #include #include -#include +#include #include #include #include diff --git a/src/trace.c b/src/trace.c index 3f6ff0543..a0b964884 100644 --- a/src/trace.c +++ b/src/trace.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/vars.c b/src/vars.c index a213657b8..227c94b9f 100644 --- a/src/vars.c +++ b/src/vars.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include diff --git a/tests/test-list.c b/tests/test-list.c index d95800e51..5e54f6034 100644 --- a/tests/test-list.c +++ b/tests/test-list.c @@ -2,7 +2,7 @@ #include #include #define USE_THREAD -#include +#include /* Stress test the mt_lists. * Compile from the haproxy directory with :