diff options
| author | bors <bors@rust-lang.org> | 2015-03-27 23:11:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-27 23:11:21 +0000 |
| commit | 552080181c58beef03493a110b4a38b20b6b5da5 (patch) | |
| tree | 3dbfd8c87647f67e1d17c726e72b153609d7eea8 /src/libstd/sys/windows/stack_overflow.rs | |
| parent | 0c9de8140b8abdd2d0a83db93746c58e8bc0da2c (diff) | |
| parent | d3a4f362cba36a4bf0bb8f8a951ae9d6858ae73e (diff) | |
| download | rust-552080181c58beef03493a110b4a38b20b6b5da5.tar.gz rust-552080181c58beef03493a110b4a38b20b6b5da5.zip | |
Auto merge of #23796 - alexcrichton:rollup, r=alexcrichton
Diffstat (limited to 'src/libstd/sys/windows/stack_overflow.rs')
| -rw-r--r-- | src/libstd/sys/windows/stack_overflow.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/windows/stack_overflow.rs b/src/libstd/sys/windows/stack_overflow.rs index b0410701ee1..79b7de4f341 100644 --- a/src/libstd/sys/windows/stack_overflow.rs +++ b/src/libstd/sys/windows/stack_overflow.rs @@ -31,7 +31,7 @@ impl Drop for Handler { } // This is initialized in init() and only read from after -static mut PAGE_SIZE: uint = 0; +static mut PAGE_SIZE: usize = 0; #[no_stack_check] extern "system" fn vectored_handler(ExceptionInfo: *mut EXCEPTION_POINTERS) -> LONG { @@ -56,7 +56,7 @@ extern "system" fn vectored_handler(ExceptionInfo: *mut EXCEPTION_POINTERS) -> L pub unsafe fn init() { let mut info = mem::zeroed(); libc::GetSystemInfo(&mut info); - PAGE_SIZE = info.dwPageSize as uint; + PAGE_SIZE = info.dwPageSize as usize; if AddVectoredExceptionHandler(0, vectored_handler) == ptr::null_mut() { panic!("failed to install exception handler"); @@ -96,7 +96,7 @@ pub type PVECTORED_EXCEPTION_HANDLER = extern "system" pub type ULONG = libc::c_ulong; const EXCEPTION_CONTINUE_SEARCH: LONG = 0; -const EXCEPTION_MAXIMUM_PARAMETERS: uint = 15; +const EXCEPTION_MAXIMUM_PARAMETERS: usize = 15; const EXCEPTION_STACK_OVERFLOW: DWORD = 0xc00000fd; extern "system" { |