REORG: include: move counters.h to haproxy/counters-t.h

Since these are only type definitions, let's move them to counters-t.h
and reserve counters.h for when functions will be needed.

diff --git a/include/types/counters.h b/include/haproxy/counters-t.h
similarity index 98%
rename from include/types/counters.h
rename to include/haproxy/counters-t.h
index 5b56c7dbb5c4708645779077c620071fa23bca71..dbd60724e08d250ac1e1eb5ade2183150fc04ee9 100644 (file)
--- a/include/types/counters.h
+++ b/include/haproxy/counters-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/counters.h
+ * include/haproxy/counters-t.h
  * This file contains structure declarations for statistics counters.
  *
  * Copyright 2008-2009 Krzysztof Piotr Oledzki <ole@ans.pl>
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_COUNTERS_H
-#define _TYPES_COUNTERS_H
+#ifndef _HAPROXY_COUNTERS_T_H
+#define _HAPROXY_COUNTERS_T_H
 
 /* counters used by listeners and frontends */
 struct fe_counters {
@@ -115,7 +115,7 @@ struct be_counters {
        } p;                                    /* protocol-specific stats */
 };
 
-#endif /* _TYPES_COUNTERS_H */
+#endif /* _HAPROXY_COUNTERS_T_H */
 
 /*
  * Local variables:

diff --git a/include/types/proxy.h b/include/types/proxy.h
index 2019de8050774e9a38394a40b84beaf69194ac8d..75f02975b528dab3e711eee06b38eddaef9c4df9 100644 (file)
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -29,6 +29,7 @@
 
 #include <haproxy/api-t.h>
 #include <haproxy/chunk.h>
+#include <haproxy/counters-t.h>
 #include <haproxy/http-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/thread.h>
@@ -39,7 +40,6 @@
 #include <types/acl.h>
 #include <types/backend.h>
 #include <types/checks.h>
-#include <types/counters.h>
 #include <types/filters.h>
 #include <haproxy/freq_ctr-t.h>
 #include <types/listener.h>

diff --git a/include/types/server.h b/include/types/server.h
index 9cf5ade646cf9e970179671b964f925fda753157..c0f6c38ae5c493ae29dba87938a578b797a2c2a1 100644 (file)
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -25,6 +25,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <haproxy/counters-t.h>
 #include <haproxy/dns-t.h>
 #include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
@@ -34,7 +35,6 @@
 #include <import/eb32tree.h>
 
 #include <types/connection.h>
-#include <types/counters.h>
 #include <haproxy/freq_ctr-t.h>
 #include <types/obj_type.h>
 #include <types/proxy.h>