From: Willy Tarreau <w@1wt.eu>
Date: Fri, 6 Mar 2020 17:40:31 +0000 (+0100)
Subject: BUILD: buffer: types/{ring.h,checks.h} should include buf.h, not buffer.h
X-Git-Tag: v2.2-dev4~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8561db936e6339e1d6d2a8de4c9ac033cd56310;p=thirdparty%2Fhaproxy.git

BUILD: buffer: types/{ring.h,checks.h} should include buf.h, not buffer.h

buffer.h relies on proto/activity because it contains some code and not
just type definitions. It must not be included from types files. It
should probably also be split in two if it starts to include a proto.
This causes some circular dependencies at other places.
---

diff --git a/include/types/checks.h b/include/types/checks.h
index 03d2305774..73650480c1 100644
--- a/include/types/checks.h
+++ b/include/types/checks.h
@@ -18,7 +18,7 @@
 #include <common/config.h>
 #include <common/mini-clist.h>
 #include <common/regex.h>
-#include <common/buffer.h>
+#include <common/buf.h>
 
 #include <types/connection.h>
 #include <types/obj_type.h>
diff --git a/include/types/ring.h b/include/types/ring.h
index 86c507ff82..5f08271711 100644
--- a/include/types/ring.h
+++ b/include/types/ring.h
@@ -22,7 +22,7 @@
 #ifndef _TYPES_RING_H
 #define _TYPES_RING_H
 
-#include <common/buffer.h>
+#include <common/buf.h>
 #include <common/compat.h>
 #include <common/config.h>
 #include <common/ist.h>