diff options
author | Andreas Schneider <mail@cynapses.org> | 2009-09-21 12:23:15 +0200 |
---|---|---|
committer | Andreas Schneider <mail@cynapses.org> | 2009-09-21 12:23:47 +0200 |
commit | 4133f484ae317909169ad8e1bc689d25cabd9a77 (patch) | |
tree | c179f9e1abd377d915de896c2befe9db860c0615 /libssh | |
parent | 041aff8060ace97ddab83037acdd228727ab9220 (diff) | |
download | libssh-4133f484ae317909169ad8e1bc689d25cabd9a77.tar.gz libssh-4133f484ae317909169ad8e1bc689d25cabd9a77.tar.xz libssh-4133f484ae317909169ad8e1bc689d25cabd9a77.zip |
Fixed building libssh with MSVC.
Thanks to Carlo Segato for the patch.
Diffstat (limited to 'libssh')
-rw-r--r-- | libssh/connect.c | 6 | ||||
-rw-r--r-- | libssh/sftp.c | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/libssh/connect.c b/libssh/connect.c index ca08b884..c472d2f6 100644 --- a/libssh/connect.c +++ b/libssh/connect.c @@ -35,9 +35,15 @@ * http://blogs.msdn.com/oldnewthing/archive/2007/04/11/2079137.aspx */ #undef _WIN32_WINNT +#ifdef HAVE_WSPIAPI_H #define _WIN32_WINNT 0x0500 /* _WIN32_WINNT_WIN2K */ #undef NTDDI_VERSION #define NTDDI_VERSION 0x05000400 /* NTDDI_WIN2KSP4 */ +#else +#define _WIN32_WINNT 0x0501 /* _WIN32_WINNT_WINXP */ +#undef NTDDI_VERSION +#define NTDDI_VERSION 0x05010000 /* NTDDI_WINXP */ +#endif #include <winsock2.h> #include <ws2tcpip.h> diff --git a/libssh/sftp.c b/libssh/sftp.c index 5265eb5a..49eb565c 100644 --- a/libssh/sftp.c +++ b/libssh/sftp.c @@ -33,6 +33,14 @@ #ifndef _WIN32 #include <arpa/inet.h> +#else +#define S_IFSOCK 0140000 +#define S_IFLNK 0120000 + +#ifdef _MSC_VER +#define S_IFBLK 0060000 +#define S_IFIFO 0010000 +#endif #endif #include "libssh/priv.h" @@ -933,7 +941,6 @@ static SFTP_ATTRIBUTES *sftp_parse_attr_4(SFTP_SESSION *sftp, ssh_buffer buf, } attr->permissions = ntohl(attr->permissions); -#ifndef _WIN32 /* FIXME on windows! */ switch (attr->permissions & S_IFMT) { case S_IFSOCK: @@ -955,7 +962,6 @@ static SFTP_ATTRIBUTES *sftp_parse_attr_4(SFTP_SESSION *sftp, ssh_buffer buf, attr->type = SSH_FILEXFER_TYPE_UNKNOWN; break; } -#endif /* _WIN32 */ } if (flags & SSH_FILEXFER_ATTR_ACCESSTIME) { @@ -1126,8 +1132,6 @@ static SFTP_ATTRIBUTES *sftp_parse_attr_3(SFTP_SESSION *sftp, ssh_buffer buf, } attr->permissions = ntohl(attr->permissions); -#ifndef _WIN32 - /* FIXME on windows */ switch (attr->permissions & S_IFMT) { case S_IFSOCK: case S_IFBLK: @@ -1148,7 +1152,6 @@ static SFTP_ATTRIBUTES *sftp_parse_attr_3(SFTP_SESSION *sftp, ssh_buffer buf, attr->type = SSH_FILEXFER_TYPE_UNKNOWN; break; } -#endif /* _WIN32 */ } if (flags & SSH_FILEXFER_ATTR_ACMODTIME) { |