From: Willy Tarreau <w@1wt.eu>
Date: Wed, 6 Oct 2021 17:54:09 +0000 (+0200)
Subject: BUILD: tree-wide: add several missing activity.h
X-Git-Tag: v2.5-dev9~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d9ddc544237c5e8df73d51b5499c967d22e459d;p=thirdparty%2Fhaproxy.git

BUILD: tree-wide: add several missing activity.h

A number of files currently access activity counters but rely on their
definitions to be inherited from other files (task.c, backend.c hlua.c,
sock.c, pool.c, stats.c, fd.c).
---

diff --git a/src/backend.c b/src/backend.c
index 43642a3666..6ec85ae1f8 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -21,8 +21,9 @@
 
 #include <import/ebmbtree.h>
 
-#include <haproxy/acl.h>
 #include <haproxy/api.h>
+#include <haproxy/acl.h>
+#include <haproxy/activity.h>
 #include <haproxy/arg.h>
 #include <haproxy/backend.h>
 #include <haproxy/channel.h>
diff --git a/src/fd.c b/src/fd.c
index 88fa3b7e5b..f6665ed57c 100644
--- a/src/fd.c
+++ b/src/fd.c
@@ -88,6 +88,7 @@
 #endif
 
 #include <haproxy/api.h>
+#include <haproxy/activity.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/fd.h>
 #include <haproxy/global.h>
diff --git a/src/listener.c b/src/listener.c
index bfe3216048..797e866b80 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -19,6 +19,7 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/api.h>
+#include <haproxy/activity.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/errors.h>
diff --git a/src/pool.c b/src/pool.c
index ad63d9ba30..e6669fbaec 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -11,7 +11,7 @@
  */
 #include <errno.h>
 
-#include <haproxy/activity-t.h>
+#include <haproxy/activity.h>
 #include <haproxy/api.h>
 #include <haproxy/applet-t.h>
 #include <haproxy/cfgparse.h>
diff --git a/src/sock.c b/src/sock.c
index a1e545f9b6..d05cf7e691 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -26,6 +26,7 @@
 #include <net/if.h>
 
 #include <haproxy/api.h>
+#include <haproxy/activity.h>
 #include <haproxy/connection.h>
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
diff --git a/src/stats.c b/src/stats.c
index 7db4c90296..2b5c0e5081 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -25,6 +25,7 @@
 #include <sys/types.h>
 
 #include <haproxy/api.h>
+#include <haproxy/activity.h>
 #include <haproxy/applet-t.h>
 #include <haproxy/backend.h>
 #include <haproxy/base64.h>
diff --git a/src/task.c b/src/task.c
index ce544c12de..34c8624c91 100644
--- a/src/task.c
+++ b/src/task.c
@@ -16,6 +16,7 @@
 #include <import/eb32tree.h>
 
 #include <haproxy/api.h>
+#include <haproxy/activity.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/fd.h>
 #include <haproxy/list.h>