diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2008-05-22 13:57:27 +0000 |
---|---|---|
committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2008-05-22 13:57:27 +0000 |
commit | c2f151ab56fb56246ac6ff946190d494e436d7a2 (patch) | |
tree | 90b90948127a5e311195baba1a418e2398d91dcb | |
parent | 7278a9df95d905234e5e86425afff457cb41b8cd (diff) | |
download | libssh-c2f151ab56fb56246ac6ff946190d494e436d7a2.tar.gz libssh-c2f151ab56fb56246ac6ff946190d494e436d7a2.tar.xz libssh-c2f151ab56fb56246ac6ff946190d494e436d7a2.zip |
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
-rw-r--r-- | include/libssh/libssh.h | 12 | ||||
-rw-r--r-- | 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 <unistd.h> +#include <inttypes.h> +#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 <sys/select.h> /* for fd_set * */ #endif #ifdef _WIN32 #include <winsock2.h> #endif -#include <inttypes.h> + #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 <winsock2.h> #include <ws2tcpip.h> -#include "wspiapi.h" +//#include "wspiapi.h" #else #include <netdb.h> #include <sys/socket.h> |