From: Willy Tarreau <w@1wt.eu>
Date: Mon, 14 Jan 2008 15:36:15 +0000 (+0100)
Subject: [BUG] build failed on CONFIG_HAP_LINUX_TPROXY without CONFIG_HAP_CTTPROXY
X-Git-Tag: v1.3.15~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4864c352098d872387473165ea84eb067f3809c2;p=thirdparty%2Fhaproxy.git

[BUG] build failed on CONFIG_HAP_LINUX_TPROXY without CONFIG_HAP_CTTPROXY

changed #ifdef
---

diff --git a/include/types/proxy.h b/include/types/proxy.h
index 5d397d403a..e0dff097bb 100644
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -204,7 +204,7 @@ struct proxy {
 	int conn_retries;			/* maximum number of connect retries */
 	int cap;				/* supported capabilities (PR_CAP_*) */
 	struct sockaddr_in source_addr;		/* the address to which we want to bind for connect() */
-#ifdef CONFIG_HAP_CTTPROXY
+#if defined(CONFIG_HAP_CTTPROXY) || defined(CONFIG_HAP_LINUX_TPROXY)
 	struct sockaddr_in tproxy_addr;		/* non-local address we want to bind to for connect() */
 #endif
 	struct proxy *next;
diff --git a/include/types/server.h b/include/types/server.h
index 73ef022f84..730ed60a73 100644
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -85,7 +85,7 @@ struct server {
 
 	struct sockaddr_in addr;		/* the address to connect to */
 	struct sockaddr_in source_addr;		/* the address to which we want to bind for connect() */
-#ifdef CONFIG_HAP_CTTPROXY
+#if defined(CONFIG_HAP_CTTPROXY) || defined(CONFIG_HAP_LINUX_TPROXY)
 	struct sockaddr_in tproxy_addr;		/* non-local address we want to bind to for connect() */
 #endif