bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #41787 - jsheard:ulongptr, r=alexcrichton

Browse source 
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
This commit is contained in:
bors 2017-05-06 22:14:43 +00:00
commit 2527f41baf
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libpanic_unwind/windows.rs
View file

@ -12,11 +12,11 @@
#![allow(dead_code)]
#![cfg(windows)]
use libc::{c_long, c_ulong, c_ulonglong, c_void};
use libc::{c_long, c_ulong, c_void};
pub type DWORD = c_ulong;
pub type LONG = c_long;
pub type ULONG_PTR = c_ulonglong;
pub type ULONG_PTR = usize;
pub type LPVOID = *mut c_void;
pub const EXCEPTION_MAXIMUM_PARAMETERS: usize = 15;

4
src/librustc_data_structures/flock.rs
View file

@ -247,11 +247,11 @@ mod imp {
use std::os::windows::raw::HANDLE;
use std::path::Path;
use std::fs::{File, OpenOptions};
use std::os::raw::{c_ulong, c_ulonglong, c_int};
use std::os::raw::{c_ulong, c_int};
type DWORD = c_ulong;
type BOOL = c_int;
type ULONG_PTR = c_ulonglong;
type ULONG_PTR = usize;
type LPOVERLAPPED = *mut OVERLAPPED;
const LOCKFILE_EXCLUSIVE_LOCK: DWORD = 0x00000002;

7
src/libstd/sys/windows/c.rs
View file

@ -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;