From c155208de42de5761231726e35614b4499b5a137 Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Tue, 27 Jan 2015 16:00:26 +0100
Subject: [PATCH] Thread native name setting, fix #10302

---
 src/libstd/sys/unix/thread.rs    | 4 ++--
 src/libstd/sys/windows/thread.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs
index 3c34e1f9dd4c..1fba6bedc7c4 100644
--- a/src/libstd/sys/unix/thread.rs
+++ b/src/libstd/sys/unix/thread.rs
@@ -223,9 +223,9 @@ pub unsafe fn set_name(name: &str) {
     pthread_set_name_np(pthread_self(), cname.as_ptr());
 }
 
-#[cfg(target_os = "macos")]
+#[cfg(any(target_os = "macos", target_os = "ios"))]
 pub unsafe fn set_name(name: &str) {
-    // pthread_setname_np() since OS X 10.6
+    // pthread_setname_np() since OS X 10.6 and iOS 3.2
     let cname = CString::from_slice(name.as_bytes());
     pthread_setname_np(cname.as_ptr());
 }
diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs
index b6027ea2e7e8..a94adcb3bc7b 100644
--- a/src/libstd/sys/windows/thread.rs
+++ b/src/libstd/sys/windows/thread.rs
@@ -67,10 +67,10 @@ pub unsafe fn create(stack: uint, p: Thunk) -> rust_thread {
     return ret;
 }
 
-pub unsafe fn set_name(name: &str) {
+pub unsafe fn set_name(_name: &str) {
     // Windows threads are nameless
     // The names in MSVC debugger are obtained using a "magic" exception,
-    // which requires a use of C++ macros.
+    // which requires a use of MS C++ extensions.
     // See https://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx
 }