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 03d2305774ea205a92efdb516887346ff9057e99..73650480c182e56a5a543f87a2aa0a1dca6861d4 100644 (file)
--- 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 86c507ff82e5532b4286e776c6bd32cc4c61415c..5f0827171190c53057ea6b0228779b4f44d02cf0 100644 (file)
--- 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>