Skip to content

Commit 7cbecae

Browse files
committed
---
yaml --- r: 142557 b: refs/heads/try2 c: db24ee9 h: refs/heads/master i: 142555: 2c2b004 v: v3
1 parent f73e56c commit 7cbecae

File tree

3 files changed

+359
-5
lines changed

3 files changed

+359
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 4a868c7c1df6a0e68b03c1710474e83c057d69c0
8+
refs/heads/try2: db24ee9db02acf0912a89626e09801665bbb365a
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/libc.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,8 @@ pub mod types {
732732
wProcessorArchitecture: 0,
733733
wReserved: 0,
734734
dwPageSize: 0,
735-
lpMinimumApplicationAddress: ptr::null(),
736-
lpMaximumApplicationAddress: ptr::null(),
735+
lpMinimumApplicationAddress: ptr::mut_null(),
736+
lpMaximumApplicationAddress: ptr::mut_null(),
737737
dwActiveProcessorMask: 0,
738738
dwNumberOfProcessors: 0,
739739
dwProcessorType: 0,
@@ -1011,7 +1011,7 @@ pub mod consts {
10111011
}
10121012
pub mod extra {
10131013
use libc::types::os::arch::c95::c_int;
1014-
use libc::types::os::arch::extra::{DWORD, BOOL};
1014+
use libc::types::os::arch::extra::{WORD, DWORD, BOOL};
10151015

10161016
pub static TRUE : BOOL = 1;
10171017
pub static FALSE : BOOL = 0;
@@ -3002,7 +3002,8 @@ pub mod funcs {
30023002
LPCVOID};
30033003
use libc::types::os::arch::extra::{LPSECURITY_ATTRIBUTES, LPSTARTUPINFO,
30043004
LPPROCESS_INFORMATION,
3005-
LPMEMORY_BASIC_INFORMATION};
3005+
LPMEMORY_BASIC_INFORMATION,
3006+
LPSYSTEM_INFO};
30063007
use libc::types::os::arch::extra::{HANDLE, LPHANDLE};
30073008

30083009
#[abi = "stdcall"]

0 commit comments

Comments
 (0)