From: Marcel Raad <Marcel.Raad@teamviewer.com>
Date: Sun, 18 Jun 2017 13:18:15 +0000 (+0200)
Subject: http_proxy: fix build with http and proxy
X-Git-Tag: curl-7_55_0~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=edafd52be16e4a64f1ae14ea0de722413eedfea2;p=thirdparty%2Fcurl.git

http_proxy: fix build with http and proxy

After deff7de0eb0e22d2d142b96b9cc84cd8db5d2a48, the build without
CURL_DISABLE_PROXY and CURL_DISABLE_HTTP was failing because of missing
includes.
---

diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index ac0d18e3c1..36567d36f4 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -26,7 +26,6 @@
 
 #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
 
-#include "urldata.h"
 #include <curl/curl.h>
 #include "sendf.h"
 #include "http.h"
diff --git a/lib/http_proxy.h b/lib/http_proxy.h
index 2e50adc8ff..e19fa859a0 100644
--- a/lib/http_proxy.h
+++ b/lib/http_proxy.h
@@ -22,6 +22,9 @@
  *
  ***************************************************************************/
 
+#include "curl_setup.h"
+#include "urldata.h"
+
 #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
 /* ftp can use this as well */
 CURLcode Curl_proxyCONNECT(struct connectdata *conn,