Revert "Update to 7.40.1"

[platform/upstream/curl.git] / lib / socks.h

diff --git a/lib/socks.h b/lib/socks.h
index 1c686d1..dc4670b 100644 (file)
--- a/lib/socks.h
+++ b/lib/socks.h
@@ -1,5 +1,5 @@
-#ifndef __CURL_SOCKS_H
-#define __CURL_SOCKS_H
+#ifndef HEADER_CURL_SOCKS_H
+#define HEADER_CURL_SOCKS_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -22,11 +22,11 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef CURL_DISABLE_PROXY
-#define Curl_SOCKS4(a,b,c,d,e,f) CURLE_FAILED_INIT
-#define Curl_SOCKS5(a,b,c,d,e,f) CURLE_FAILED_INIT
+#define Curl_SOCKS4(a,b,c,d,e,f) CURLE_NOT_BUILT_IN
+#define Curl_SOCKS5(a,b,c,d,e,f) CURLE_NOT_BUILT_IN
 #else
 /*
  * Helper read-from-socket functions. Does the same as Curl_read() but it
@@ -39,8 +39,7 @@ int Curl_blockread_all(struct connectdata *conn,
                        curl_socket_t sockfd,
                        char *buf,
                        ssize_t buffersize,
-                       ssize_t *n,
-                       long conn_timeout);
+                       ssize_t *n);
 
 /*
  * This function logs in to a SOCKS4(a) proxy and sends the specifics to the
@@ -74,4 +73,5 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
 
 #endif /* CURL_DISABLE_PROXY */
 
-#endif  /* __CURL_SOCKS_H */
+#endif  /* HEADER_CURL_SOCKS_H */
+