commit 551271d99c3afd1abcc71522c3367e125f880da6
author Willy Tarreau <w@1wt.eu> Thu Jun 04 08:32:23 2020 +0200
committer Willy Tarreau <w@1wt.eu> Thu Jun 11 10:18:57 2020 +0200
tree aed83029c74f501e282d8ca8994ad864f892d8f0
parent ba2f73d40eacb4c4f9e709fbcaa5d75733c38618

REORG: include: move pipe.h to haproxy/pipe{,-t}.h

No change was needed beyond a minor cleanup.

src/cli.c

diff --git a/src/cli.c b/src/cli.c
index bdfb270..afb42b5 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -53,7 +53,7 @@
 #include <proto/frontend.h>
 #include <proto/log.h>
 #include <proto/pattern.h>
-#include <proto/pipe.h>
+#include <haproxy/pipe.h>
 #include <haproxy/protocol.h>
 #include <proto/listener.h>
 #include <proto/map.h>

src/mux_h1.c

diff --git a/src/mux_h1.c b/src/mux_h1.c
index ef22cce..f2ba338 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -18,7 +18,7 @@
 
 #include <import/ebistree.h>
 
-#include <types/pipe.h>
+#include <haproxy/pipe-t.h>
 #include <types/proxy.h>
 #include <types/session.h>
 

src/pipe.c

diff --git a/src/pipe.c b/src/pipe.c
index 6fe7b05..992c77b 100644
--- a/src/pipe.c
+++ b/src/pipe.c
@@ -18,7 +18,7 @@
 #include <haproxy/pool.h>
 
 #include <types/global.h>
-#include <types/pipe.h>
+#include <haproxy/pipe-t.h>
 
 DECLARE_STATIC_POOL(pool_head_pipe, "pipe", sizeof(struct pipe));
 

src/raw_sock.c

diff --git a/src/raw_sock.c b/src/raw_sock.c
index c1af72a..3c64d3c 100644
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -32,7 +32,7 @@
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
 #include <proto/log.h>
-#include <proto/pipe.h>
+#include <haproxy/pipe.h>
 #include <proto/raw_sock.h>
 #include <proto/stream_interface.h>
 #include <proto/task.h>

src/stats.c

diff --git a/src/stats.c b/src/stats.c
index 115b9ad..fa193bc 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -57,7 +57,7 @@
 #include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/pattern.h>
-#include <proto/pipe.h>
+#include <haproxy/pipe.h>
 #include <proto/listener.h>
 #include <proto/map.h>
 #include <proto/proxy.h>

src/stream.c

diff --git a/src/stream.c b/src/stream.c
index 904eaef..b3c6a0c 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -52,7 +52,7 @@
 #include <proto/raw_sock.h>
 #include <proto/session.h>
 #include <proto/stream.h>
-#include <proto/pipe.h>
+#include <haproxy/pipe.h>
 #include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/queue.h>

src/stream_interface.c

diff --git a/src/stream_interface.c b/src/stream_interface.c
index 921b191..157fa51 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -30,13 +30,13 @@
 #include <proto/connection.h>
 #include <proto/http_htx.h>
 #include <proto/mux_pt.h>
-#include <proto/pipe.h>
+#include <haproxy/pipe.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
 #include <proto/task.h>
 
-#include <types/pipe.h>
+#include <haproxy/pipe-t.h>
 
 /* functions used by default on a detached stream-interface */
 static void stream_int_shutr(struct stream_interface *si);