From: Willy Tarreau <w@1wt.eu>
Date: Tue, 27 Aug 2024 17:17:25 +0000 (+0200)
Subject: CLEANUP: muxes: remove useless inclusion of ebmbtree.h
X-Git-Tag: v3.1-dev10~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d288ddb57519ba83034e5eeb78d45018c7d2b0b7;p=thirdparty%2Fhaproxy.git

CLEANUP: muxes: remove useless inclusion of ebmbtree.h

Since 2.7 with commit 8522348482 ("BUG/MAJOR: conn-idle: fix hash indexing
issues on idle conns"), we've been using eb64 trees and not ebmb trees
anymore, and later we dropped all that to centralize the operations in
the server. Let's remove the ebmbtree.h includes from the muxes that do
not use them.
---

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 1ba4612dad..def1bf1fb8 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -12,7 +12,6 @@
 
 #include <import/ist.h>
 #include <import/eb32tree.h>
-#include <import/ebmbtree.h>
 
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
diff --git a/src/mux_h1.c b/src/mux_h1.c
index 94895ff150..ba530e63a4 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -10,7 +10,6 @@
  *
  */
 #include <import/ebistree.h>
-#include <import/ebmbtree.h>
 
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
diff --git a/src/mux_h2.c b/src/mux_h2.c
index c58b6fb7e8..41258075ec 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -11,7 +11,6 @@
  */
 
 #include <import/eb32tree.h>
-#include <import/ebmbtree.h>
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
diff --git a/src/mux_spop.c b/src/mux_spop.c
index b98b75dca5..5766889532 100644
--- a/src/mux_spop.c
+++ b/src/mux_spop.c
@@ -2,7 +2,6 @@
 
 #include <import/ist.h>
 #include <import/eb32tree.h>
-#include <import/ebmbtree.h>
 
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>