diff options
| author | Chris Denton <chris@chrisdenton.dev> | 2024-07-14 06:43:43 +0000 |
|---|---|---|
| committer | Chris Denton <chris@chrisdenton.dev> | 2024-07-15 05:01:19 +0000 |
| commit | 65da4af0be038d9f73d36515d1ce5d83c0fb96e2 (patch) | |
| tree | c79b40d786c4fe50ead206996b99e9da25b4da2f | |
| parent | 91ba4ebcfdaf6e12bbb04649cadb3e3e83604e0f (diff) | |
| download | rust-65da4af0be038d9f73d36515d1ce5d83c0fb96e2.tar.gz rust-65da4af0be038d9f73d36515d1ce5d83c0fb96e2.zip | |
Remove LONG
| -rw-r--r-- | library/std/src/sys/pal/windows/c.rs | 4 | ||||
| -rw-r--r-- | library/std/src/sys/pal/windows/stack_overflow.rs | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/library/std/src/sys/pal/windows/c.rs b/library/std/src/sys/pal/windows/c.rs index c85cc62fde7..315bffa220e 100644 --- a/library/std/src/sys/pal/windows/c.rs +++ b/library/std/src/sys/pal/windows/c.rs @@ -8,7 +8,7 @@ use crate::ffi::CStr; use crate::mem; pub use crate::os::raw::c_int; -use crate::os::raw::{c_char, c_long, c_uint, c_ulong, c_ushort, c_void}; +use crate::os::raw::{c_char, c_uint, c_ulong, c_ushort, c_void}; use crate::os::windows::io::{AsRawHandle, BorrowedHandle}; use crate::ptr; @@ -18,8 +18,6 @@ mod windows_sys; pub use windows_sys::*; pub type DWORD = c_ulong; -#[cfg_attr(target_vendor = "uwp", allow(unused))] -pub type LONG = c_long; pub type UINT = c_uint; pub type WCHAR = u16; pub type USHORT = c_ushort; diff --git a/library/std/src/sys/pal/windows/stack_overflow.rs b/library/std/src/sys/pal/windows/stack_overflow.rs index f93f31026f8..59feb0c601a 100644 --- a/library/std/src/sys/pal/windows/stack_overflow.rs +++ b/library/std/src/sys/pal/windows/stack_overflow.rs @@ -11,7 +11,7 @@ pub unsafe fn reserve_stack() { debug_assert_ne!(result, 0, "failed to reserve stack space for exception handling"); } -unsafe extern "system" fn vectored_handler(ExceptionInfo: *mut c::EXCEPTION_POINTERS) -> c::LONG { +unsafe extern "system" fn vectored_handler(ExceptionInfo: *mut c::EXCEPTION_POINTERS) -> i32 { unsafe { let rec = &(*(*ExceptionInfo).ExceptionRecord); let code = rec.ExceptionCode; |