diff options
| author | bors <bors@rust-lang.org> | 2017-02-16 05:52:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-16 05:52:46 +0000 |
| commit | d77af7f639adab33b79fc71fdad3dcc813a40c86 (patch) | |
| tree | 4ad416b814701dc784b0ca90317ad04f4db71f99 /src/libstd/sys | |
| parent | 1b6f1fe9dd29c97fca66a7377f367d0beb327b58 (diff) | |
| parent | c6edfdb261381b75dc22bbba0dc5bd2765d8ffc5 (diff) | |
| download | rust-d77af7f639adab33b79fc71fdad3dcc813a40c86.tar.gz rust-d77af7f639adab33b79fc71fdad3dcc813a40c86.zip | |
Auto merge of #39876 - frewsxcv:rollup, r=frewsxcv
Rollup of 12 pull requests - Successful merges: #39775, #39793, #39804, #39834, #39836, #39839, #39840, #39843, #39844, #39846, #39857, #39861 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/mod.rs | 12 | ||||
| -rw-r--r-- | src/libstd/sys/windows/c.rs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/libstd/sys/mod.rs b/src/libstd/sys/mod.rs index 14da376efa9..ef4dc365dbe 100644 --- a/src/libstd/sys/mod.rs +++ b/src/libstd/sys/mod.rs @@ -13,11 +13,11 @@ //! The `std::sys` module is the abstracted interface through which //! `std` talks to the underlying operating system. It has different //! implementations for different operating system families, today -//! just Unix and Windows. +//! just Unix and Windows, and initial support for Redox. //! //! The centralization of platform-specific code in this module is //! enforced by the "platform abstraction layer" tidy script in -//! `tools/tidy/pal.rs`. +//! `tools/tidy/src/pal.rs`. //! //! This module is closely related to the platform-independent system //! integration code in `std::sys_common`. See that module's @@ -34,10 +34,6 @@ pub use self::imp::*; -#[cfg(target_os = "redox")] -#[path = "redox/mod.rs"] -mod imp; - #[cfg(unix)] #[path = "unix/mod.rs"] mod imp; @@ -45,3 +41,7 @@ mod imp; #[cfg(windows)] #[path = "windows/mod.rs"] mod imp; + +#[cfg(target_os = "redox")] +#[path = "redox/mod.rs"] +mod imp; diff --git a/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs index e5010ca3564..4daab31c28f 100644 --- a/src/libstd/sys/windows/c.rs +++ b/src/libstd/sys/windows/c.rs @@ -912,7 +912,7 @@ extern "system" { pub fn Sleep(dwMilliseconds: DWORD); pub fn GetProcessId(handle: HANDLE) -> DWORD; pub fn GetUserProfileDirectoryW(hToken: HANDLE, - lpProfileDir: LPCWSTR, + lpProfileDir: LPWSTR, lpcchSize: *mut DWORD) -> BOOL; pub fn SetHandleInformation(hObject: HANDLE, dwMask: DWORD, |