aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <mail@cynapses.org>2010-05-12 13:53:25 +0200
committerAndreas Schneider <mail@cynapses.org>2010-05-12 13:53:25 +0200
commit4ecefb501702cb993eb3acd98876a378783526b6 (patch)
tree3a0ec5296b98b001050749b052bc69e305f3ef88
parent444008aabc44ae029efc6e0e56f00700e9c123ff (diff)
downloadlibssh-4ecefb501702cb993eb3acd98876a378783526b6.tar.gz
libssh-4ecefb501702cb993eb3acd98876a378783526b6.tar.xz
libssh-4ecefb501702cb993eb3acd98876a378783526b6.zip
Fixed linking errors on Windows.
-rw-r--r--libssh/client.c2
-rw-r--r--libssh/connect.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/libssh/client.c b/libssh/client.c
index 875cc4af..042c1231 100644
--- a/libssh/client.c
+++ b/libssh/client.c
@@ -707,8 +707,10 @@ int ssh_connect(ssh_session session) {
if (session->fd != -1) {
ssh_socket_set_fd(session->socket, session->fd);
ret=SSH_OK;
+#ifndef _WIN32
} else if (session->ProxyCommand != NULL){
ret=ssh_socket_connect_proxycommand(session->socket, session->ProxyCommand);
+#endif
} else {
ret=ssh_socket_connect(session->socket, session->host, session->port,
session->bindaddr);
diff --git a/libssh/connect.c b/libssh/connect.c
index b7d9a721..daf26cef 100644
--- a/libssh/connect.c
+++ b/libssh/connect.c
@@ -85,12 +85,12 @@
#endif /* HAVE_REGCOMP */
#ifdef _WIN32
-static void ssh_sock_set_nonblocking(socket_t sock) {
+void ssh_sock_set_nonblocking(socket_t sock) {
u_long nonblocking = 1;
ioctlsocket(sock, FIONBIO, &nonblocking);
}
-static void ssh_sock_set_blocking(socket_t sock) {
+void ssh_sock_set_blocking(socket_t sock) {
u_long nonblocking = 0;
ioctlsocket(sock, FIONBIO, &nonblocking);
}