shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 09:54:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fixed linking errors on Windows.

Browse Source
This commit is contained in:
Andreas Schneider
2010-05-12 13:53:25 +02:00
parent 444008aabc
commit 4ecefb5017
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libssh/client.c
View File

@@ -707,8 +707,10 @@ int ssh_connect(ssh_session session) {
if (session->fd != -1) { if (session->fd != -1) {
ssh_socket_set_fd(session->socket, session->fd); ssh_socket_set_fd(session->socket, session->fd);
ret=SSH_OK; ret=SSH_OK;
#ifndef _WIN32
} else if (session->ProxyCommand != NULL){ } else if (session->ProxyCommand != NULL){
ret=ssh_socket_connect_proxycommand(session->socket, session->ProxyCommand); ret=ssh_socket_connect_proxycommand(session->socket, session->ProxyCommand);
#endif
} else { } else {
ret=ssh_socket_connect(session->socket, session->host, session->port, ret=ssh_socket_connect(session->socket, session->host, session->port,
session->bindaddr); session->bindaddr);

4
libssh/connect.c
View File

@@ -85,12 +85,12 @@
#endif /* HAVE_REGCOMP */ #endif /* HAVE_REGCOMP */
#ifdef _WIN32 #ifdef _WIN32
static void ssh_sock_set_nonblocking(socket_t sock) { void ssh_sock_set_nonblocking(socket_t sock) {
u_long nonblocking = 1; u_long nonblocking = 1;
ioctlsocket(sock, FIONBIO, &nonblocking); 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; u_long nonblocking = 0;
ioctlsocket(sock, FIONBIO, &nonblocking); ioctlsocket(sock, FIONBIO, &nonblocking);
} }