diff options
| author | Manuel Schölling <[email protected]> | 2015-03-12 20:17:47 +0100 |
|---|---|---|
| committer | Manuel Schölling <[email protected]> | 2015-04-06 12:22:51 +0200 |
| commit | 3680763906eff20ffb39bff114b17330afac9563 (patch) | |
| tree | cb122cc35ac717f9d6c87cbb6a28decc13153e16 /openssl/src | |
| parent | Fix travis path to test bash script (diff) | |
| download | rust-openssl-3680763906eff20ffb39bff114b17330afac9563.tar.xz rust-openssl-3680763906eff20ffb39bff114b17330afac9563.zip | |
Fix OSX related compiler error and correct travis OpenSSL setup
Diffstat (limited to 'openssl/src')
| -rw-r--r-- | openssl/src/ssl/connected_socket.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openssl/src/ssl/connected_socket.rs b/openssl/src/ssl/connected_socket.rs index 825e29ca..45991bc4 100644 --- a/openssl/src/ssl/connected_socket.rs +++ b/openssl/src/ssl/connected_socket.rs @@ -71,7 +71,7 @@ fn new_sockaddr_in() -> sockaddr_in { target_os = "windows")))] fn new_sockaddr_in() -> sockaddr_in { sockaddr_in { - sin_len: mem::size_of::<sockaddr_in>(), + sin_len: mem::size_of::<sockaddr_in>() as u8, sin_family: AF_INET as sa_family_t, sin_port: 0, sin_zero: [0; 8], @@ -99,7 +99,7 @@ fn new_sockaddr_in6() -> sockaddr_in6 { target_os = "windows")))] fn new_sockaddr_in6() -> sockaddr_in6 { sockaddr_in6 { - sin6_len: mem::size_of::<sockaddr_in6>(), + sin6_len: mem::size_of::<sockaddr_in6>() as u8, sin6_family: AF_INET6 as sa_family_t, sin6_port: 0, sin6_flowinfo: 0, @@ -256,7 +256,7 @@ impl<S:AsRawFd> SetTimeout for S { unsafe { setsockopt(self.as_raw_fd(), SOL_SOCKET, SO_RCVTIMEO, - mem::transmute(&tv), mem::size_of_val(&tv) as u32) + mem::transmute(&tv), mem::size_of_val(&tv) as socklen_t) }; } } |