The previous commit to force the use of libssh2-0.16 by removing

LIBSSH2_APINO

diff --git a/lib/transfer.c b/lib/transfer.c
index efa8cdd026ee6f19de22eebf9cd08e6fe08279e5..f276dc0f8f252f84798513c568dae90d8085e01a 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -332,10 +332,10 @@ CURLcode Curl_readwrite(struct connectdata *conn,
 
   if((k->keepon & (KEEP_READ|KEEP_READ_HOLD)) == KEEP_READ) {
     fd_read = conn->sockfd;
-#if defined(USE_LIBSSH2) && defined(LIBSSH2_APINO) && (LIBSSH2_APINO >= 200706012030L)
+#if defined(USE_LIBSSH2)
     if (conn->protocol & (PROT_SCP|PROT_SFTP))
       select_res |= CURL_CSELECT_IN;
-#endif /* USE_LIBSSH2 && LIBSSH2_APINO && (LIBSSH2_APINO >= 200706012030L) */
+#endif /* USE_LIBSSH2 */
   } else
     fd_read = CURL_SOCKET_BAD;
 

diff --git a/lib/url.c b/lib/url.c
index 35f8644b84f95e50ba03f8d821e5c19ee36aff92..e184c2b0996e299f20c27ff4f36e3512c557d56a 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -3446,10 +3446,8 @@ static CURLcode CreateConnection(struct SessionHandle *data,
     conn->curl_connect = Curl_ssh_connect; /* ssh_connect? */
     conn->curl_do = Curl_scp_do;
     conn->curl_done = Curl_scp_done;
-#if defined(LIBSSH2_APINO) && (LIBSSH2_APINO >= 200706012030L)
     conn->curl_connecting = Curl_ssh_multi_statemach;
     conn->curl_doing = Curl_scp_doing;
-#endif /* LIBSSH2_APINO && (LIBSSH2_APINO >= 200706012030L) */
     conn->curl_do_more = (Curl_do_more_func)ZERO_NULL;
 #else
     failf(data, LIBCURL_NAME
@@ -3465,10 +3463,8 @@ static CURLcode CreateConnection(struct SessionHandle *data,
     conn->curl_connect = Curl_ssh_connect; /* ssh_connect? */
     conn->curl_do = Curl_sftp_do;
     conn->curl_done = Curl_sftp_done;
-#if defined(LIBSSH2_APINO) && (LIBSSH2_APINO >= 200706012030L)
     conn->curl_connecting = Curl_ssh_multi_statemach;
     conn->curl_doing = Curl_sftp_doing;
-#endif /* LIBSSH2_APINO && (LIBSSH2_APINO >= 200706012030L) */
     conn->curl_do_more = (Curl_do_more_func)ZERO_NULL;
 #else
     failf(data, LIBCURL_NAME