Steven Van Ingelgem wrote:
> > If you're interested in working on this I'll be happy to get a
> > patch to apply after 1.2...

> --- libssh2-old/src/libssh2_priv.h    di jul 28 12:31:58 2009
> +++ libssh2/src/libssh2_priv.h        di jul 28 12:31:02 2009
> @@ -96,10 +96,9 @@
>  /* Provide iovec / writev on WIN32 platform. */
>  #ifdef WIN32
>  
> -/* same as WSABUF */
>  struct iovec {
> -    u_long iov_len;
> -    char *iov_base;
> +    size_t iov_len;
> +    void * iov_base;
>  };
>  
>  #define inline __inline
> @@ -149,6 +148,14 @@
>  
>  #endif
>  
> +
> +#if WIN32

This should probably be #ifdef to match the rest of the code, and the
extra blank line before it seems unneccessary.


> +typedef SOCKET libssh2_socket_t;
> +#else /* !WIN32 */
> +typedef int libssh2_socket_t;
> +#endif /* WIN32 */
> +
> +

As does one of these two blank lines.


>  /* RFC4253 section 6.1 Maximum Packet Length says:
>   *
>   * "All implementations MUST be able to process packets with
> @@ -724,7 +731,7 @@
>      LIBSSH2_LISTENER *listeners;
>  
>      /* Actual I/O socket */
> -    int socket_fd;
> +    libssh2_socket_t socket_fd;
>      int socket_state;
>      int socket_block_directions;
>      int socket_prev_blockstate; /* stores the state of the socket blockiness

Other than that I kind of think this could go in before 1.2?


//Peter
_______________________________________________
libssh2-devel http://cool.haxx.se/cgi-bin/mailman/listinfo/libssh2-devel

Reply via email to