From c2f151ab56fb56246ac6ff946190d494e436d7a2 Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Thu, 22 May 2008 13:57:27 +0000 Subject: [PATCH] libssh.h now can be included from visual studio revert the wsapi wont-fix git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@161 7dcaeef0-15fb-0310-b436-a5af3365683c --- include/libssh/libssh.h | 12 +++++++++++- libssh/connect.c | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index 43312a6c..f0114f88 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -20,14 +20,24 @@ MA 02111-1307, USA. */ #ifndef _LIBSSH_H #define _LIBSSH_H +#ifndef _MSC_VER #include +#include +#else +//visual studio hasn't inttypes.h so it doesn't know uint32_t +typedef unsigned int uint32_t; +typedef unsigned short uint16_t; +typedef unsigned char uint8_t; +typedef unsigned long long uint64_t; + +#endif #ifndef _WIN32 #include /* for fd_set * */ #endif #ifdef _WIN32 #include #endif -#include + #define LIBSSH_VERSION "libssh-0.2.1-svn" diff --git a/libssh/connect.c b/libssh/connect.c index 9f865bbd..504882db 100644 --- a/libssh/connect.c +++ b/libssh/connect.c @@ -29,7 +29,7 @@ MA 02111-1307, USA. */ #define _WIN32_WINNT 0x0501 //getaddrinfo, freeaddrinfo, getnameinfo #include #include -#include "wspiapi.h" +//#include "wspiapi.h" #else #include #include