Test fixes and rebase conflicts

2015-02-10 11:05:20 -08:00 · 2015-02-10 11:05:20 -08:00 · 3e10785e21
commit 3e10785e21
parent 1138f88f82
10 changed files with 8 additions and 13 deletions
--- a/src/liblibc/lib.rs
+++ b/src/liblibc/lib.rs
@ -1930,7 +1930,7 @@ pub mod types {
                    pub iSecurityScheme: c_int,
                    pub dwMessageSize: DWORD,
                    pub dwProviderReserved: DWORD,
-                    pub szProtocol: [u8; WSAPROTOCOL_LEN as usize + 1],
+                    pub szProtocol: [u8; WSAPROTOCOL_LEN as usize + 1us],
                }

                pub type LPWSAPROTOCOL_INFO = *mut WSAPROTOCOL_INFO;