REORG: include: move cfgparse.h to haproxy/cfgparse.h

There's no point splitting the file in two since only cfgparse uses the
types defined there. A few call places were updated and cleaned up. All
of them were in C files which register keywords.

There is nothing left in common/ now so this directory must not be used
anymore.

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index bc968d98e7e5b2cc144318a77fa47cb215139e45..9375f0a31cda93d4d68c6a818d6975b576588f35 100644 (file)
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -17,7 +17,7 @@
 #include <haproxy/applet.h>
 #include <haproxy/backend.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>

diff --git a/include/common/cfgparse.h b/include/haproxy/cfgparse.h
similarity index 97%
rename from include/common/cfgparse.h
rename to include/haproxy/cfgparse.h
index 86bceb629a92c4f331daecd539e9a74fb1b927fc..447c057b93e6cc155f9b9be5ba2ecaf583811001 100644 (file)
--- a/include/common/cfgparse.h
+++ b/include/haproxy/cfgparse.h
@@ -1,8 +1,8 @@
 /*
- * include/common/cfgparse.h
+ * include/haproxy/cfgparse.h
  * Configuration parsing functions.
  *
- * Copyright (C) 2000-2012 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
  * modify it under the terms of the GNU Lesser General Public
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _COMMON_CFGPARSE_H
-#define _COMMON_CFGPARSE_H
+#ifndef _HAPROXY_CFGPARSE_H
+#define _HAPROXY_CFGPARSE_H
 
 #include <haproxy/api.h>
 #include <haproxy/list-t.h>
@@ -148,7 +148,7 @@ static inline int warnifnotcap(struct proxy *proxy, int cap, const char *file, i
 #define REGISTER_CONFIG_POSTPARSER(name, parser)                              \
        INITCALL2(STG_REGISTER, cfg_register_postparser, (name), (parser))
 
-#endif /* _COMMON_CFGPARSE_H */
+#endif /* _HAPROXY_CFGPARSE_H */
 
 /*
  * Local variables:

diff --git a/src/51d.c b/src/51d.c
index 12f40ea09218fdcc6580a5df0448bf74d0c1d14c..68195cd293022200e5407a4a099157bed8e70a93 100644 (file)
--- a/src/51d.c
+++ b/src/51d.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/errors.h>

diff --git a/src/activity.c b/src/activity.c
index 92bce339c6c82487827454817433025680add21e..17eb13c1a1b3ba18c358c4b5d5ee4c7ab01e32d4 100644 (file)
--- a/src/activity.c
+++ b/src/activity.c
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/stream_interface.h>

diff --git a/src/cache.c b/src/cache.c
index ba96ede658aae641be16db4602f92655b79d852d..56368f3cc1552cd40534c06b186acfc479bd317f 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -12,6 +12,7 @@
 
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/filters.h>
@@ -27,7 +28,6 @@
 #include <import/sha1.h>
 
 
-#include <common/cfgparse.h>
 #include <haproxy/hash.h>
 #include <haproxy/htx.h>
 #include <haproxy/net_helper.h>

diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c
index 81261722ae05827efe6e0f1c47ddeec83e13c18e..d6d7243089914606e382ab174e0db77f050ca091 100644 (file)
--- a/src/cfgparse-global.c
+++ b/src/cfgparse-global.c
@@ -11,7 +11,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/compression.h>
 #include <haproxy/global.h>
 

diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index cdb68401a461fcacc577207d5231932d9da59253..0544df448d7a9c4a64aced9f5177822bd169956e 100644 (file)
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -11,11 +11,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <common/cfgparse.h>
 #include <haproxy/uri_auth.h>
 
 #include <haproxy/acl.h>
 #include <haproxy/capture-t.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/compression-t.h>
 #include <haproxy/connection.h>

diff --git a/src/cfgparse-ssl.c b/src/cfgparse-ssl.c
index 831bdb41f05bc46d484a3c8e6b05990241a5073d..144cef882c383e40ac317c7e26c0d9e3201965e5 100644 (file)
--- a/src/cfgparse-ssl.c
+++ b/src/cfgparse-ssl.c
@@ -33,7 +33,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/listener.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/ssl_sock.h>

diff --git a/src/cfgparse.c b/src/cfgparse.c
index a983e5ad2c2b8e5e7897bcf6c9da003773db3f78..0bb4f2bbc39df8509c42228d6329f7dcd05e0597 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -39,7 +39,7 @@
 #include <haproxy/backend.h>
 #include <haproxy/api.h>
 #include <haproxy/capture.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/chunk.h>

diff --git a/src/check.c b/src/check.c
index 308a86ec3d88d0356765147c2e7d49a065f39fb1..f8df0e9f06d51adb83c44183fb2c46bc2379011c 100644 (file)
--- a/src/check.c
+++ b/src/check.c
@@ -32,7 +32,7 @@
 
 #include <haproxy/action.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/chunk.h>
 #include <haproxy/dns.h>

diff --git a/src/cli.c b/src/cli.c
index c39cbb6fbb6ef8f23f53350552e170488a0aab98..b6249ddeea7936a6f68d4c13d1c97174a81bd9bf 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -28,7 +28,7 @@
 
 #include <haproxy/applet-t.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>

diff --git a/src/compression.c b/src/compression.c
index cd548fc453552d6b7d9486640b9335bbb5a2b6c7..7d4720eebfedbc69e0f602372ecf40dd83d028eb 100644 (file)
--- a/src/compression.c
+++ b/src/compression.c
@@ -27,8 +27,8 @@
 #endif /* USE_ZLIB */
 
 #include <haproxy/api.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/dynbuf.h>
-#include <common/cfgparse.h>
 #include <haproxy/stream.h>
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>

diff --git a/src/connection.c b/src/connection.c
index 3c9b21e7c134a919ccafc6c47e5b5e21b7e90807..e27ba74387e88fd8a40964bc56c5d4e288a9a5bb 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -13,7 +13,7 @@
 #include <errno.h>
 
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/frontend.h>
 #include <haproxy/namespace.h>

diff --git a/src/da.c b/src/da.c
index 6090851abc8079229dbf9d9071fc165acbeb685a..a47fc300eff76d10cef11e252f747f01a3e08202 100644 (file)
--- a/src/da.c
+++ b/src/da.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/errors.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana.h>

diff --git a/src/dns.c b/src/dns.c
index 8eddde9478dfd12d20ae60a44abbbb90e824a42c..9ba1873fe72ff3b3adaf43bdd1f4283c6db0e97d 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -21,7 +21,7 @@
 
 #include <haproxy/action.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>

diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index 434fc02f04be60145b47f467d2da6fd8b809406c..1833557561c564317ca4a12c63aeca0f63262d41 100644 (file)
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -12,8 +12,8 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/api.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
-#include <common/cfgparse.h>
 #include <haproxy/errors.h>
 #include <haproxy/fcgi-app.h>
 #include <haproxy/filters.h>

diff --git a/src/filters.c b/src/filters.c
index f0bfcf52ee9bfee075957eb09b1cd46eb5bc3c45..1d4119b6ce30dd187575a82eec93ec3fc2d707ad 100644 (file)
--- a/src/filters.c
+++ b/src/filters.c
@@ -12,7 +12,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/buf-t.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/compression.h>
 #include <haproxy/errors.h>
 #include <haproxy/filters.h>

diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index 30b5aad2b1c6de89d1dc60c8a9aa0480215750e4..664124980a6518877a2176114e7981565258f242 100644 (file)
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -11,13 +11,13 @@
  */
 
 #include <haproxy/api.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/compression.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/filters.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
-#include <common/cfgparse.h>
 #include <haproxy/htx.h>
 #include <haproxy/list.h>
 #include <haproxy/proxy-t.h>

diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 25c075be76f25a474f246c6a762159366b811f74..a53bcd9dddedb8a9b3382e9fe0d73f61876f821a 100644 (file)
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -16,7 +16,7 @@
 #include <haproxy/action-t.h>
 #include <haproxy/arg.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/filters.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/frontend.h>

diff --git a/src/h1_htx.c b/src/h1_htx.c
index f6f21f2b396e8f5d5e591e3366909c0167f3d958..e32d845296bb18e0ecb113ba1217301d4827740c 100644 (file)
--- a/src/h1_htx.c
+++ b/src/h1_htx.c
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/global.h>
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>

diff --git a/src/haproxy.c b/src/haproxy.c
index 043625f91dde56ffeefffb44816334b45e1fa210..f066f5f1394e5104c36d01187f434246bc0b1c2c 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -84,7 +84,7 @@
 #include <import/sha1.h>
 
 #include <haproxy/base64.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>

diff --git a/src/hlua.c b/src/hlua.c
index ef41e7d91952d9bf8d70804ec77d5987cfe7e0c5..fd5ba062eab2054b6685245f9300312cb32ad728 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -26,7 +26,7 @@
 #include <import/ebpttree.h>
 
 #include <haproxy/arg.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>

diff --git a/src/http_act.c b/src/http_act.c
index a688acbaa043145b3847dfbc98806ee627e1eddd..f83b32bfe309fcc6e154e824f5027727f6bd2476 100644 (file)
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -19,7 +19,7 @@
 #include <haproxy/acl.h>
 #include <haproxy/action.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>

diff --git a/src/http_htx.c b/src/http_htx.c
index d5d8747ff2c9c03eca7d589506e2370e67558bc7..e3e21d772b810812c0a1d5eea4aa69962b37b129 100644 (file)
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -20,7 +20,7 @@
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
 
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/h1.h>
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>

diff --git a/src/http_rules.c b/src/http_rules.c
index e4506f93cebd82517bdf57057ca0197c154e3fa6..d2bb4f29dd548acd73f2d4d4a9ccdad181a90bab 100644 (file)
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -19,7 +19,7 @@
 #include <haproxy/acl.h>
 #include <haproxy/action.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>

diff --git a/src/listener.c b/src/listener.c
index a7ff80374fbb9d28b2a8605d727e69354d43d0b3..82eb2e7ad95fbbce41325ade3c5bbed97e1939fb 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -20,7 +20,7 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index dc4bab1d1880d2a0979d62b4b1aa90e7fef77931..b03210f7ae736d7f2a0411c0c287e89c746732b1 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/fcgi.h>
 #include <haproxy/fcgi-app.h>

diff --git a/src/mux_h1.c b/src/mux_h1.c
index cffdd60bef0f365e5c01b4d819026ed7a8fd1335..5a66f7d41e3d35b65982b5a158a071fae6bf4fdb 100644 (file)
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -11,7 +11,7 @@
  */
 #include <haproxy/api.h>
 #include <haproxy/istbuf.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 44a43321521c51362919f1ef8b227214ba02c5bd..102e74ee721e89e63b34bb7ff0ac6c013b15b894 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -13,7 +13,7 @@
 #include <import/eb32tree.h>
 #include <haproxy/api.h>
 #include <haproxy/istbuf.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/h1.h>
 #include <haproxy/h2.h>

diff --git a/src/mworker-prog.c b/src/mworker-prog.c
index f6e61ed3593b32cfa6e7e2a768d15a7b03c59edd..d0b9446e6b0dd8a2233d4e2993724e6c6a6f7c47 100644 (file)
--- a/src/mworker-prog.c
+++ b/src/mworker-prog.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/log.h>

diff --git a/src/mworker.c b/src/mworker.c
index 9dd9f33d6b54da05c7e3a6e6c013b3da3099ac4c..e2b154e5d37d16699df7e2fc2c4155b0d1a08b9c 100644 (file)
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -18,7 +18,7 @@
 #include <sys/wait.h>
 
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/fd.h>
 #include <haproxy/global.h>

diff --git a/src/pool.c b/src/pool.c
index 78809bb7a51a659572e5bd4b7152f0a9909ece91..82ca79a743cc364d62410f840a179db097b449e3 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -13,11 +13,11 @@
 
 #include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/global.h>
 
-#include <common/cfgparse.h>
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>

diff --git a/src/proxy.c b/src/proxy.c
index e13c4edc9ad17bae39e9680291ade6caa21bec17..ba8a07d0fd3987524281d3d24e6627a325dea9b1 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -19,7 +19,7 @@
 
 #include <haproxy/applet-t.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/errors.h>
 #include <haproxy/filters.h>

diff --git a/src/server.c b/src/server.c
index 32aa72ee73b40a05d0528de044cc7e07f219c6b4..0d9b533037e5d223ac1620627b44107447566c0a 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -14,12 +14,12 @@
 #include <ctype.h>
 #include <errno.h>
 
+#include <import/xxhash.h>
+
 #include <haproxy/applet-t.h>
 #include <haproxy/backend.h>
 #include <haproxy/api.h>
-#include <import/xxhash.h>
-
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>

diff --git a/src/sink.c b/src/sink.c
index b6e1b857e68a1c7614a7686bfd1db4945957c7c0..5a4980b61a6766b1e250a658dd1f422260ecb422 100644 (file)
--- a/src/sink.c
+++ b/src/sink.c
@@ -19,7 +19,7 @@
  */
 
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
 #include <import/ist.h>
 #include <haproxy/list.h>

diff --git a/src/stats.c b/src/stats.c
index 558e48f92597eb17b1cfd79527666b068e58a43c..b42ae7adf75d59ee74cdbefe157336f94d6baed7 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -27,7 +27,7 @@
 #include <haproxy/applet-t.h>
 #include <haproxy/backend.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>

diff --git a/src/stick_table.c b/src/stick_table.c
index 821ab984b4d5673d746e936ef10403ea8d21be70..0bdc62dbcf5239fe3d0cb1cfb15bf0f834d715b5 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -15,7 +15,7 @@
 #include <errno.h>
 
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/global.h>
 #include <haproxy/http_rules.h>

diff --git a/src/stream.c b/src/stream.c
index ecc65acafc82c7c7b5e3297f674a3ff980509268..09f6f192ae6f6db4086280f1fd7b17b0c1ba0ce8 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -22,7 +22,7 @@
 #include <haproxy/backend.h>
 #include <haproxy/api.h>
 #include <haproxy/capture.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 5966fce73cc86114bc7086e76c35b1b8a07c2672..5f8c74dd5fed564fcbda71de9ee97aae37270838 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -14,7 +14,7 @@
 #include <haproxy/arg-t.h>
 #include <haproxy/api.h>
 #include <haproxy/capture-t.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/connection.h>
 #include <haproxy/global.h>

diff --git a/src/thread.c b/src/thread.c
index b0cbd3487e6b83f946a3b1274be89ec0c8779b63..c58669f4a39c56d5db6aead5cc1606000cc499b7 100644 (file)
--- a/src/thread.c
+++ b/src/thread.c
@@ -23,7 +23,7 @@
 #include <sys/cpuset.h>
 #endif
 
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/thread.h>
 #include <haproxy/tools.h>
 #include <haproxy/global.h>

diff --git a/src/vars.c b/src/vars.c
index 53afe1a41f15630d5309f33c0925120a649a194d..d58e1a32502be28d7fe45e98db972e20956662b4 100644 (file)
--- a/src/vars.c
+++ b/src/vars.c
@@ -2,7 +2,7 @@
 
 #include <haproxy/arg.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>

diff --git a/src/wurfl.c b/src/wurfl.c
index 57e794e16c8113fbf5360f0188eb1c2cff0ca541..9a1d858b2d785b06ee7f61b93bdc5effb44de0ec 100644 (file)
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -3,7 +3,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/buf-t.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>