---

vojtechkral · vojtechkral · commit df787e9de65d · 2015-01-28T14:01:14.000+01:00
yaml --- r: 177593 b: refs/heads/auto c: 7e67eba h: refs/heads/master i: 177591: f0ba6b7 v: v3
diff --git a/[refs] b/[refs]
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 33a3d6d88f76bfae770983ee50e36e23cc4c7655
+refs/heads/auto: 7e67eba180eb2efb09e1487020a9a160335e7926
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/libstd/sys/unix/thread.rs b/branches/auto/src/libstd/sys/unix/thread.rs
@@ -296,7 +296,7 @@ extern {
     fn pthread_set_name_np(tid: libc::pthread_t, name: *const libc::c_char);
 }
 
-#[cfg(target_os = "macos")]
+#[cfg(any(target_os = "macos", target_os = "ios"))]
 extern {
     pub fn pthread_self() -> libc::pthread_t;
     pub fn pthread_get_stackaddr_np(thread: libc::pthread_t) -> *mut libc::c_void;

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ extern {`
`296`	`296`	`fn pthread_set_name_np(tid: libc::pthread_t, name: *const libc::c_char);`
`297`	`297`	`}`
`298`	`298`
`299`		`-#[cfg(target_os = "macos")]`
	`299`	`+#[cfg(any(target_os = "macos", target_os = "ios"))]`
`300`	`300`	`extern {`
`301`	`301`	`pub fn pthread_self() -> libc::pthread_t;`
`302`	`302`	`pub fn pthread_get_stackaddr_np(thread: libc::pthread_t) -> *mut libc::c_void;`