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 ac0d18e3c1e8b0ec35ad0e7a74e990b6e6f63816..36567d36f42d002f5b261571886e8c7dfa73e547 100644 (file)
--- 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 2e50adc8ff50b287b4685c26e9ebc53bf9d85f98..e19fa859a06954ea8ae415ce0c71eade818506c3 100644 (file)
--- 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,