summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Housley <jim@thehousleys.net>2007-06-13 11:27:41 +0000
committerJames Housley <jim@thehousleys.net>2007-06-13 11:27:41 +0000
commit3ec7f8a25a0a811e2099d427aca26b3c68ff0740 (patch)
tree418becf43effa451a32689cf6ab26d8fe57e5934
parent375cdf89adaf11a14a7717c39245ac997d0da699 (diff)
downloadgnurl-3ec7f8a25a0a811e2099d427aca26b3c68ff0740.tar.gz
gnurl-3ec7f8a25a0a811e2099d427aca26b3c68ff0740.tar.bz2
gnurl-3ec7f8a25a0a811e2099d427aca26b3c68ff0740.zip
Add a define to protect the state machine from older versions of libssh2,
ie 0.14, that don't know about newer constants used in the state machine.
-rw-r--r--lib/ssh.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/ssh.c b/lib/ssh.c
index d439be98a..2890e46ce 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -234,6 +234,7 @@ static LIBSSH2_FREE_FUNC(libssh2_free)
(void)abstract;
}
+#if (LIBSSH2_APINO >= 200706012030)
/*
* SSH State machine related code
*/
@@ -674,7 +675,9 @@ static CURLcode ssh_statemach_act(struct connectdata *conn)
CURLcode Curl_ssh_multi_statemach(struct connectdata *conn,
bool *done)
{
+#if 0
curl_socket_t sock = conn->sock[FIRSTSOCKET];
+#endif
int rc = 1;
struct SessionHandle *data=conn->data;
struct ssh_conn *sshc = &conn->proto.sshc;
@@ -711,7 +714,9 @@ CURLcode Curl_ssh_multi_statemach(struct connectdata *conn,
static CURLcode ssh_easy_statemach(struct connectdata *conn)
{
+#if 0
curl_socket_t sock = conn->sock[FIRSTSOCKET];
+#endif
int rc = 1;
struct SessionHandle *data=conn->data;
struct ssh_conn *sshc = &conn->proto.sshc;
@@ -748,6 +753,7 @@ static CURLcode ssh_easy_statemach(struct connectdata *conn)
return result;
}
+#endif (LIBSSH2_APINO >= 200706012030)
/*
* SSH setup and connection