From: Willy Tarreau <w@1wt.eu>
Date: Thu, 4 Jun 2020 06:52:38 +0000 (+0200)
Subject: REORG: include: move compression.h to haproxy/compression{,-t}.h
X-Git-Tag: v2.2-dev9~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a3bd3919eb41a85d9467072f164d5671ee7f3e6;p=thirdparty%2Fhaproxy.git

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

No change was needed.
---

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 65eb44da20..b79fab587d 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -25,7 +25,7 @@
 #include <proto/action.h>
 #include <proto/applet.h>
 #include <proto/backend.h>
-#include <proto/compression.h>
+#include <haproxy/compression.h>
 #include <proto/frontend.h>
 #include <proto/listener.h>
 #include <proto/http_htx.h>
diff --git a/include/types/compression.h b/include/haproxy/compression-t.h
similarity index 95%
rename from include/types/compression.h
rename to include/haproxy/compression-t.h
index 1604909992..1dbf6e11ac 100644
--- a/include/types/compression.h
+++ b/include/haproxy/compression-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/compression.h
+ * include/haproxy/compression-t.h
  * This file defines everything related to compression.
  *
  * Copyright 2012 Exceliance, David Du Colombier <dducolombier@exceliance.fr>
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_COMP_H
-#define _TYPES_COMP_H
+#ifndef _HAPROXY_COMP_T_H
+#define _HAPROXY_COMP_T_H
 
 #if defined(USE_SLZ)
 #ifdef USE_ZLIB
@@ -85,7 +85,7 @@ struct comp_type {
 };
 
 
-#endif /* _TYPES_COMP_H */
+#endif /* _HAPROXY_COMP_T_H */
 
 /*
  * Local variables:
diff --git a/include/proto/compression.h b/include/haproxy/compression.h
similarity index 89%
rename from include/proto/compression.h
rename to include/haproxy/compression.h
index 7b60472c70..ba2bdab7cc 100644
--- a/include/proto/compression.h
+++ b/include/haproxy/compression.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/compression.h
+ * include/haproxy/compression.h
  * This file defines function prototypes for compression.
  *
  * Copyright 2012 (C) Exceliance, David Du Colombier <dducolombier@exceliance.fr>
@@ -20,10 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_COMP_H
-#define _PROTO_COMP_H
+#ifndef _HAPROXY_COMP_H
+#define _HAPROXY_COMP_H
 
-#include <types/compression.h>
+#include <haproxy/compression-t.h>
 
 extern unsigned int compress_min_idle;
 
@@ -34,7 +34,7 @@ int comp_append_algo(struct comp *comp, const char *algo);
 extern long zlib_used_memory;
 #endif /* USE_ZLIB */
 
-#endif /* _PROTO_COMP_H */
+#endif /* _HAPROXY_COMP_H */
 
 /*
  * Local variables:
diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c
index 2b3249758e..2120b635f2 100644
--- a/src/cfgparse-global.c
+++ b/src/cfgparse-global.c
@@ -12,7 +12,7 @@
 #include <unistd.h>
 
 #include <common/cfgparse.h>
-#include <proto/compression.h>
+#include <haproxy/compression.h>
 
 /*
  * parse a line in a <global> section. Returns the error code, 0 if OK, or
diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index bd3e61e741..c9c6b75237 100644
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -15,7 +15,7 @@
 #include <common/uri_auth.h>
 
 #include <types/capture.h>
-#include <types/compression.h>
+#include <haproxy/compression-t.h>
 #include <types/stats.h>
 
 #include <proto/acl.h>
diff --git a/src/cli.c b/src/cli.c
index afb42b590c..11c8dc565a 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -46,7 +46,7 @@
 #include <proto/channel.h>
 #include <proto/checks.h>
 #include <proto/cli.h>
-#include <proto/compression.h>
+#include <haproxy/compression.h>
 #include <proto/stats.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
diff --git a/src/compression.c b/src/compression.c
index f1d739e70d..77da4057a9 100644
--- a/src/compression.c
+++ b/src/compression.c
@@ -33,10 +33,10 @@
 #include <haproxy/pool.h>
 
 #include <types/global.h>
-#include <types/compression.h>
+#include <haproxy/compression-t.h>
 
 #include <proto/acl.h>
-#include <proto/compression.h>
+#include <haproxy/compression.h>
 #include <haproxy/freq_ctr.h>
 #include <proto/stream.h>
 
diff --git a/src/filters.c b/src/filters.c
index 31f9f10b61..592b30320b 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -21,7 +21,7 @@
 #include <types/filters.h>
 #include <types/http_ana.h>
 
-#include <proto/compression.h>
+#include <haproxy/compression.h>
 #include <proto/filters.h>
 #include <proto/flt_http_comp.h>
 #include <proto/http_htx.h>
diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index 462ee25958..8d02fc7593 100644
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -11,6 +11,7 @@
  */
 
 #include <haproxy/api.h>
+#include <haproxy/compression.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/http.h>
 #include <common/cfgparse.h>
@@ -18,12 +19,10 @@
 #include <haproxy/list.h>
 #include <haproxy/tools.h>
 
-#include <types/compression.h>
 #include <types/filters.h>
 #include <types/proxy.h>
 #include <types/sample.h>
 
-#include <proto/compression.h>
 #include <proto/filters.h>
 #include <proto/http_htx.h>
 #include <proto/http_ana.h>
diff --git a/src/stats.c b/src/stats.c
index 43654e4178..21dd009c01 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -26,6 +26,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/compression.h>
 #include <haproxy/debug.h>
 #include <haproxy/http.h>
 #include <haproxy/htx.h>
@@ -48,7 +49,6 @@
 #include <proto/channel.h>
 #include <proto/checks.h>
 #include <proto/cli.h>
-#include <proto/compression.h>
 #include <proto/dns.h>
 #include <proto/stats.h>
 #include <haproxy/fd.h>