New upstream version 1.46.0~beta.2+dfsg1

[rustc.git] / vendor / winapi / src / um / winnt.rs

diff --git a/vendor/winapi/src/um/winnt.rs b/vendor/winapi/src/um/winnt.rs
index eb518c47a3d0f0a505ccd4faaba8f3365f0911dc..f687489bd565a00793f2df2c775417042ab8c3e4 100644 (file)
--- a/vendor/winapi/src/um/winnt.rs
+++ b/vendor/winapi/src/um/winnt.rs
@@ -148,25 +148,9 @@ pub const MAXLONGLONG: LONGLONG = 0x7fffffffffffffff;
 pub type PLONGLONG = *mut LONGLONG;
 pub type PULONGLONG = *mut ULONGLONG;
 pub type USN = LONGLONG;
-STRUCT!{struct LARGE_INTEGER_u {
-    LowPart: DWORD,
-    HighPart: LONG,
-}}
-UNION!{union LARGE_INTEGER {
-    [u64; 1],
-    QuadPart QuadPart_mut: LONGLONG,
-    u u_mut: LARGE_INTEGER_u,
-}}
+pub use shared::ntdef::LARGE_INTEGER;
 pub type PLARGE_INTEGER = *mut LARGE_INTEGER;
-STRUCT!{struct ULARGE_INTEGER_u {
-    LowPart: DWORD,
-    HighPart: LONG,
-}}
-UNION!{union ULARGE_INTEGER {
-    [u64; 1],
-    QuadPart QuadPart_mut: ULONGLONG,
-    u u_mut: ULARGE_INTEGER_u,
-}}
+pub use shared::ntdef::ULARGE_INTEGER;
 pub type PULARGE_INTEGER = *mut ULARGE_INTEGER;
 pub type RTL_REFERENCE_COUNT = LONG_PTR;
 pub type PRTL_REFERENCE_COUNT = *mut LONG_PTR;
@@ -4052,7 +4036,7 @@ pub const SEC_COMMIT: DWORD = 0x8000000;
 pub const SEC_NOCACHE: DWORD = 0x10000000;
 pub const SEC_WRITECOMBINE: DWORD = 0x40000000;
 pub const SEC_LARGE_PAGES: DWORD = 0x80000000;
-pub const SEC_IMAGE_NO_EXECUTE: DWORD = (SEC_IMAGE | SEC_NOCACHE);
+pub const SEC_IMAGE_NO_EXECUTE: DWORD = SEC_IMAGE | SEC_NOCACHE;
 pub const MEM_IMAGE: DWORD = SEC_IMAGE;
 pub const WRITE_WATCH_FLAG_RESET: DWORD = 0x01;
 pub const MEM_UNMAP_WITH_TRANSIENT_BOOST: DWORD = 0x01;
@@ -6972,7 +6956,7 @@ STRUCT!{struct _IMAGE_RUNTIME_FUNCTION_ENTRY {
     EndAddress: DWORD,
     u: IMAGE_RUNTIME_FUNCTION_ENTRY_u,
 }}
-type _PIMAGE_RUNTIME_FUNCTION_ENTRY = *mut _IMAGE_RUNTIME_FUNCTION_ENTRY;
+pub type _PIMAGE_RUNTIME_FUNCTION_ENTRY = *mut _IMAGE_RUNTIME_FUNCTION_ENTRY;
 pub type IMAGE_IA64_RUNTIME_FUNCTION_ENTRY = _IMAGE_RUNTIME_FUNCTION_ENTRY;
 pub type PIMAGE_IA64_RUNTIME_FUNCTION_ENTRY = _PIMAGE_RUNTIME_FUNCTION_ENTRY;
 #[cfg(target_arch = "aarch64")]