diff options
| author | bors <bors@rust-lang.org> | 2017-05-06 22:14:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-06 22:14:43 +0000 |
| commit | 2527f41baf2e487da68134d019cb5608ec93cbf2 (patch) | |
| tree | 98aad1b02f6b16e43ab89e5ba3877bb17951cf91 /src/libstd | |
| parent | c1a960a03108a0f71ec6c4d9e7291722eba5abbc (diff) | |
| parent | db8be04e49f32d36270e87b71b74c4b71764647e (diff) | |
| download | rust-2527f41baf2e487da68134d019cb5608ec93cbf2.tar.gz rust-2527f41baf2e487da68134d019cb5608ec93cbf2.zip | |
Auto merge of #41787 - jsheard:ulongptr, r=alexcrichton
Fix definitions of ULONG_PTR The Windows type `ULONG_PTR` is supposed to be equivalent to `usize`, but several parts of the codebase currently define it as `u64`. Evidently this hasn't broken anything yet but it might cause annoying 32-bit-specific breakage in future. See https://msdn.microsoft.com/en-gb/library/windows/desktop/aa383751(v=vs.85).aspx r? @alexcrichton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/windows/c.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs index 4e08c7a0125..5e46069cf7d 100644 --- a/src/libstd/sys/windows/c.rs +++ b/src/libstd/sys/windows/c.rs @@ -14,8 +14,9 @@ #![cfg_attr(test, allow(dead_code))] #![unstable(issue = "0", feature = "windows_c")] -use os::raw::{c_int, c_uint, c_ulong, c_long, c_longlong, c_ushort,}; -use os::raw::{c_char, c_ulonglong}; +use os::raw::{c_int, c_uint, c_ulong, c_long, c_longlong, c_ushort, c_char}; +#[cfg(target_arch = "x86_64")] +use os::raw::c_ulonglong; use libc::{wchar_t, size_t, c_void}; use ptr; @@ -45,7 +46,7 @@ pub type SIZE_T = usize; pub type WORD = u16; pub type CHAR = c_char; pub type HCRYPTPROV = LONG_PTR; -pub type ULONG_PTR = c_ulonglong; +pub type ULONG_PTR = usize; pub type ULONG = c_ulong; #[cfg(target_arch = "x86_64")] pub type ULONGLONG = u64; |