From b82131332706e5b39cb12186ce7ff6c682281464 Mon Sep 17 00:00:00 2001
From: king6cong <king6cong@gmail.com>
Date: Wed, 15 Feb 2017 18:38:34 +0800
Subject: sys/mod doc update and mod import order adjust

---
 src/libstd/sys/mod.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/libstd/sys')

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;
-- 
cgit 1.4.1-3-g733a5


From d5a4db3c16c5fa203f03b7f0b9c7f85d17e8b8ad Mon Sep 17 00:00:00 2001
From: Peter Atashian <retep998@gmail.com>
Date: Wed, 15 Feb 2017 17:31:51 -0500
Subject: Fix parameter to GetUserProfileDirectoryW

---
 src/libstd/sys/windows/c.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libstd/sys')

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,
-- 
cgit 1.4.1-3-g733a5