From d204a624e4ebf40d727ebe7be50c6f7f0c62c4ad Mon Sep 17 00:00:00 2001 From: Tim Warren Date: Wed, 8 Apr 2015 11:13:26 -0400 Subject: [PATCH] Some windows-specific stuff --- src/network/SFTP.cpp | 16 ++++++++++++++++ src/network/SFTP.h | 8 +++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/network/SFTP.cpp b/src/network/SFTP.cpp index 78b1710..d016c07 100644 --- a/src/network/SFTP.cpp +++ b/src/network/SFTP.cpp @@ -10,7 +10,11 @@ SFTP::~SFTP() { libssh2_sftp_shutdown(sftp_session); libssh2_session_disconnect(session, "Normal Shutdown, Thank you for playing"); libssh2_session_free(session); +#ifdef __WXWIN__ + closesocket(sock); +#else close(sock); +#endif libssh2_exit(); freeaddrinfo(host_info_list); freeaddrinfo(&host_info); @@ -73,6 +77,18 @@ string SFTP::getFile(const char *path) void SFTP::ssh_connect(const char *host, const char *user, const char *pass, const char *port) { +#ifdef __WXWIN__ + WSADATA wsadata; + int err; + + err = WSAStartup(MAKEWORD(2,0), &wsadata); + if (err != 0) + { + cerr << "WSAStartup failed with error:" << err << endl; + return; + } +#endif + // Clear out memory in addr structure memset(&host_info, 0, sizeof host_info); diff --git a/src/network/SFTP.h b/src/network/SFTP.h index b5a17fc..704f2b9 100644 --- a/src/network/SFTP.h +++ b/src/network/SFTP.h @@ -12,7 +12,13 @@ // Socket includes #include -#include + +#ifdef __WXWIN__ + #include +#else + #include +#endif + #include #include