From: Thierry FOURNIER <tfournier@haproxy.com>
Date: Tue, 16 Dec 2014 14:41:18 +0000 (+0100)
Subject: MINOR: includes: fix a lot of missing or useless includes
X-Git-Tag: v1.6-dev1~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac836baad1a14002e80afa0f3f7ef5740f97cfb5;p=thirdparty%2Fhaproxy.git

MINOR: includes: fix a lot of missing or useless includes

These modifications are done for resolving cross-dependent
includes in the upcoming LUA code.

<proto/channel.h> misses <types/channel.h>.

<types/acl.h> doesn't use <types/session.h> because the session
is already declared in the file as undefined pointer.

appsession.c misses <unistd.h> to use "write()".

Declare undefined pointer "struct session" for <types/proxy.h>
and <types/queue.h>. These includes dont need the detail of this
struct.
---

diff --git a/include/proto/channel.h b/include/proto/channel.h
index 42bba15b0a..da47c166bc 100644
--- a/include/proto/channel.h
+++ b/include/proto/channel.h
@@ -32,6 +32,7 @@
 #include <common/ticks.h>
 #include <common/time.h>
 
+#include <types/channel.h>
 #include <types/global.h>
 
 extern struct pool_head *pool2_channel;
diff --git a/include/types/acl.h b/include/types/acl.h
index 80b2c39a69..173204d5c4 100644
--- a/include/types/acl.h
+++ b/include/types/acl.h
@@ -31,7 +31,6 @@
 #include <types/pattern.h>
 #include <types/proxy.h>
 #include <types/server.h>
-#include <types/session.h>
 
 #include <ebmbtree.h>
 
diff --git a/include/types/proxy.h b/include/types/proxy.h
index 968946070b..30409f9f03 100644
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -46,7 +46,6 @@
 #include <types/obj_type.h>
 #include <types/proto_http.h>
 #include <types/sample.h>
-#include <types/session.h>
 #include <types/server.h>
 #include <types/stick_table.h>
 
@@ -186,6 +185,8 @@ enum pr_mode {
 #define STK_IS_STORE	0x00000002	/* store on request fetch */
 #define STK_ON_RSP	0x00000004	/* store on response fetch */
 
+struct session;
+
 struct error_snapshot {
 	struct timeval when;		/* date of this event, (tv_sec == 0) means "never" */
 	unsigned int len;		/* original length of the last invalid request/response */
diff --git a/include/types/queue.h b/include/types/queue.h
index 922aa92fd0..9ff8df5f94 100644
--- a/include/types/queue.h
+++ b/include/types/queue.h
@@ -26,7 +26,8 @@
 #include <common/mini-clist.h>
 
 #include <types/server.h>
-#include <types/session.h>
+
+struct session;
 
 struct pendconn {
 	struct list list;		/* chaining ... */
diff --git a/src/appsession.c b/src/appsession.c
index c22be45ce6..7b72296169 100644
--- a/src/appsession.c
+++ b/src/appsession.c
@@ -13,6 +13,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <common/appsession.h>
 #include <common/config.h>