---

vojtechkral · vojtechkral · commit aec06801b8cc · 2015-01-28T16:52:53.000+01:00
yaml --- r: 177594 b: refs/heads/auto c: 9ee972c h: refs/heads/master 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: 7e67eba180eb2efb09e1487020a9a160335e7926
+refs/heads/auto: 9ee972ca32b1f91eb6880e1bc9c8bb5a4faf1f29
 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
@@ -278,7 +278,7 @@ fn min_stack_size(_: *const libc::pthread_attr_t) -> libc::size_t {
     PTHREAD_STACK_MIN
 }
 
-#[cfg(any(target_os = "linux"))]
+#[cfg(any(target_os = "linux", target_os = "android"))]
 extern {
     pub fn pthread_self() -> libc::pthread_t;
     pub fn pthread_getattr_np(native: libc::pthread_t,

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ fn min_stack_size(_: *const libc::pthread_attr_t) -> libc::size_t {`
`278`	`278`	`PTHREAD_STACK_MIN`
`279`	`279`	`}`
`280`	`280`
`281`		`-#[cfg(any(target_os = "linux"))]`
	`281`	`+#[cfg(any(target_os = "linux", target_os = "android"))]`
`282`	`282`	`extern {`
`283`	`283`	`pub fn pthread_self() -> libc::pthread_t;`
`284`	`284`	`pub fn pthread_getattr_np(native: libc::pthread_t,`