From 31895212798c2c4d2093b799be7f337f28317aa3 Mon Sep 17 00:00:00 2001
From: Christophe Baribaud <christophe.baribaud@gmail.com>
Date: Thu, 20 Sep 2012 11:35:11 +0200
Subject: [PATCH 3/3] ssize_t renamed to ssh_ssize_t to avoid conflicts

Under Windows, ssize_t is already defined

Signed-off-by: Christophe Baribaud <christophe.baribaud@gmail.com>
---
 include/libssh/sftp.h |    6 +++---
 src/agent.c           |    2 +-
 src/sftp.c            |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/libssh/sftp.h b/include/libssh/sftp.h
index e9fbae8..26b04e8 100644
--- a/include/libssh/sftp.h
+++ b/include/libssh/sftp.h
@@ -55,7 +55,7 @@ extern "C" {
 #endif /* gid_t */
 #ifdef _MSC_VER
 #ifndef ssize_t
-  typedef _W64 SSIZE_T ssize_t;
+  typedef _W64 SSIZE_T ssh_ssize_t;
 #endif /* ssize_t */
 #endif /* _MSC_VER */
 #endif /* _WIN32 */
@@ -458,7 +458,7 @@ LIBSSH_API void sftp_file_set_blocking(sftp_file handle);
  *
  * @see sftp_get_error()
  */
-LIBSSH_API ssize_t sftp_read(sftp_file file, void *buf, size_t count);
+LIBSSH_API ssh_ssize_t sftp_read(sftp_file file, void *buf, size_t count);
 
 /**
  * @brief Start an asynchronous read from a file using an opened sftp file handle.
@@ -534,7 +534,7 @@ LIBSSH_API int sftp_async_read(sftp_file file, void *data, uint32_t len, uint32_
  * @see                 sftp_read()
  * @see                 sftp_close()
  */
-LIBSSH_API ssize_t sftp_write(sftp_file file, const void *buf, size_t count);
+LIBSSH_API ssh_ssize_t sftp_write(sftp_file file, const void *buf, size_t count);
 
 /**
  * @brief Seek to a specific location in a file.
diff --git a/src/agent.c b/src/agent.c
index ecf2392..9fa0af0 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -87,7 +87,7 @@ static void agent_put_u32(void *vp, uint32_t v) {
 static size_t atomicio(ssh_socket s, void *buf, size_t n, int do_read) {
   char *b = buf;
   size_t pos = 0;
-  ssize_t res;
+  ssh_ssize_t res;
   ssh_pollfd_t pfd;
   socket_t fd = ssh_socket_get_fd_in(s);
 
diff --git a/src/sftp.c b/src/sftp.c
index 456f94a..e38e823 100644
--- a/src/sftp.c
+++ b/src/sftp.c
@@ -1693,7 +1693,7 @@ void sftp_file_set_blocking(sftp_file handle){
 }
 
 /* Read from a file using an opened sftp file handle. */
-ssize_t sftp_read(sftp_file handle, void *buf, size_t count) {
+ssh_ssize_t sftp_read(sftp_file handle, void *buf, size_t count) {
   sftp_session sftp = handle->sftp;
   sftp_message msg = NULL;
   sftp_status_message status;
@@ -1901,7 +1901,7 @@ int sftp_async_read(sftp_file file, void *data, uint32_t size, uint32_t id){
   return SSH_ERROR;
 }
 
-ssize_t sftp_write(sftp_file file, const void *buf, size_t count) {
+ssh_ssize_t sftp_write(sftp_file file, const void *buf, size_t count) {
   sftp_session sftp = file->sftp;
   sftp_message msg = NULL;
   sftp_status_message status;
-- 
1.7.7