[GNUnet-SVN] [gnurl] 18/208: http-proxy: fix build with --disable-proxy or --disable-http

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.

commit 0d39e5cc95177b0255c32b24b9907dd67bf56252
Author: Daniel Stenberg <address@hidden>
AuthorDate: Thu Jun 15 23:57:31 2017 +0200

    http-proxy: fix build with --disable-proxy or --disable-http
    
    Reported-by: Dan Fandrich
---
 lib/http_proxy.c | 5 +++++
 lib/http_proxy.h | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index cd5e7c269..380eded2e 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -677,5 +677,10 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn,
   return result;
 }
 
+#else
+void Curl_connect_free(struct Curl_easy *data)
+{
+  (void)data;
+}
 
 #endif /* CURL_DISABLE_PROXY */
diff --git a/lib/http_proxy.h b/lib/http_proxy.h
index bd9d6f590..2e50adc8f 100644
--- a/lib/http_proxy.h
+++ b/lib/http_proxy.h
@@ -35,11 +35,14 @@ CURLcode Curl_proxy_connect(struct connectdata *conn, int 
sockindex);
 
 bool Curl_connect_complete(struct connectdata *conn);
 bool Curl_connect_ongoing(struct connectdata *conn);
-void Curl_connect_free(struct Curl_easy *data);
 
 #else
 #define Curl_proxyCONNECT(x,y,z,w) CURLE_NOT_BUILT_IN
 #define Curl_proxy_connect(x,y) CURLE_OK
+#define Curl_connect_complete(x) CURLE_OK
+#define Curl_connect_ongoing(x) FALSE
 #endif
 
+void Curl_connect_free(struct Curl_easy *data);
+
 #endif /* HEADER_CURL_HTTP_PROXY_H */

-- 
To stop receiving notification emails like this one, please contact
address@hidden