REORG: include: move activity to haproxy/
This moves types/activity.h to haproxy/activity-t.h and
proto/activity.h to haproxy/activity.h.
The macros defining the bit field values for the profiling variable
were moved to the type file to be more future-proof.
diff --git a/src/activity.c b/src/activity.c
index 0732197..c0da3e8 100644
--- a/src/activity.c
+++ b/src/activity.c
@@ -14,7 +14,7 @@
#include <common/cfgparse.h>
#include <common/standard.h>
#include <haproxy/thread-t.h>
-#include <types/activity.h>
+#include <haproxy/activity-t.h>
#include <proto/channel.h>
#include <proto/cli.h>
#include <haproxy/freq_ctr.h>
diff --git a/src/cli.c b/src/cli.c
index 8084dfd..b9a2369 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -41,7 +41,7 @@
#include <types/dns.h>
#include <types/stats.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/backend.h>
#include <proto/channel.h>
#include <proto/checks.h>
diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index 8378383..4ddf8c5 100644
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -22,7 +22,7 @@
#include <types/global.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/fd.h>
#include <proto/signal.h>
diff --git a/src/ev_evports.c b/src/ev_evports.c
index 359acf9..b65c18e 100644
--- a/src/ev_evports.c
+++ b/src/ev_evports.c
@@ -25,7 +25,7 @@
#include <types/global.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/fd.h>
#include <proto/log.h>
#include <proto/signal.h>
diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c
index efc2ecf..ee88020 100644
--- a/src/ev_kqueue.c
+++ b/src/ev_kqueue.c
@@ -24,7 +24,7 @@
#include <types/global.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/fd.h>
#include <proto/signal.h>
diff --git a/src/ev_poll.c b/src/ev_poll.c
index 7239732..0d0c147 100644
--- a/src/ev_poll.c
+++ b/src/ev_poll.c
@@ -24,7 +24,7 @@
#include <types/global.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/fd.h>
diff --git a/src/ev_select.c b/src/ev_select.c
index 9168f59..c1e3edf 100644
--- a/src/ev_select.c
+++ b/src/ev_select.c
@@ -21,7 +21,7 @@
#include <types/global.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/fd.h>
diff --git a/src/haproxy.c b/src/haproxy.c
index 40d31d7..99e8907 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -105,7 +105,7 @@
#include <types/peers.h>
#include <proto/acl.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/arg.h>
#include <proto/auth.h>
#include <proto/backend.h>
diff --git a/src/pool.c b/src/pool.c
index 3a4b34c..2ad2be6 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -23,7 +23,7 @@
#include <haproxy/list.h>
#include <common/standard.h>
-#include <types/activity.h>
+#include <haproxy/activity-t.h>
#include <proto/applet.h>
#include <proto/cli.h>
diff --git a/src/stream.c b/src/stream.c
index 955bc44..b6b2e14 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -30,7 +30,7 @@
#include <proto/acl.h>
#include <proto/action.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/arg.h>
#include <proto/backend.h>
#include <proto/channel.h>