From e5bf645010f74408060ced7d0c327a5f65823d1b Mon Sep 17 00:00:00 2001
From: Andreas Schneider <mail@cynapses.org>
Date: Tue, 1 Dec 2009 16:15:54 +0100
Subject: Fixed uint* to work on Windows.

Thanks to Patrick Spendrin.
---
 include/libssh/libssh.h | 4 ++++
 include/libssh/pcap.h   | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index a17e90a2..b8462209 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -50,6 +50,7 @@
 
 #ifdef _MSC_VER
   /* Visual Studio hasn't inttypes.h so it doesn't know uint32_t */
+  typedef int int32_t;
   typedef unsigned int uint32_t;
   typedef unsigned short uint16_t;
   typedef unsigned char uint8_t;
@@ -62,6 +63,9 @@
 
 #ifdef _WIN32
   #include <winsock2.h>
+  #ifndef socklen_t
+  #define socklen_t int
+  #endif
 #else /* _WIN32 */
  #include <sys/select.h> /* for fd_set * */
  #include <netdb.h>
diff --git a/include/libssh/pcap.h b/include/libssh/pcap.h
index 831a5647..2026f470 100644
--- a/include/libssh/pcap.h
+++ b/include/libssh/pcap.h
@@ -7,7 +7,7 @@
 #ifdef WITH_PCAP
 typedef struct ssh_pcap_context_struct* ssh_pcap_context;
 
-int ssh_pcap_file_write_packet(ssh_pcap_file pcap, ssh_buffer packet, u_int32_t original_len);
+int ssh_pcap_file_write_packet(ssh_pcap_file pcap, ssh_buffer packet, uint32_t original_len);
 
 ssh_pcap_context ssh_pcap_context_new(ssh_session session);
 void ssh_pcap_context_free(ssh_pcap_context ctx);
@@ -18,7 +18,7 @@ enum ssh_pcap_direction{
 };
 void ssh_pcap_context_set_file(ssh_pcap_context, ssh_pcap_file);
 int ssh_pcap_context_write(ssh_pcap_context,enum ssh_pcap_direction direction, void *data,
-		u_int32_t len, u_int32_t origlen);
+		uint32_t len, uint32_t origlen);
 
 
 #endif /* WITH_PCAP */
-- 
cgit