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 1ba4612dadb3d819cc31e5996ee2cbbfaf943b12..def1bf1fb87110583153730bf2d40fa5e146e222 100644 (file)
--- 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 94895ff1501100b086248471526b6027f9ecddb1..ba530e63a47baf002e1bd1b0e162fd041f9f47e4 100644 (file)
--- 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 c58b6fb7e87d9532458a095604a69df3601f8da6..41258075ecd064f48dec9aa9934320b7fd62bbc3 100644 (file)
--- 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 b98b75dca5d72cecee62aa1d10cd1458b8d8caa9..576688953282bde70eaaca7f209d8a1b45c2794d 100644 (file)
--- 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>