diff options
| author | bors <bors@rust-lang.org> | 2013-03-15 17:18:44 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-15 17:18:44 -0700 |
| commit | 4ad9e5c0c29c0ef4ea62f31679de3f072abb454f (patch) | |
| tree | f5cd60c0fa4fda7f9b348a8e4b6cd20087869c41 /src/libcore | |
| parent | 6859a6d9a327d7fcd81a38c8e3af6aa0005f7944 (diff) | |
| parent | 1a6a37e01a700191f200cd1d9f1ebdf08d1dec2d (diff) | |
| download | rust-4ad9e5c0c29c0ef4ea62f31679de3f072abb454f.tar.gz rust-4ad9e5c0c29c0ef4ea62f31679de3f072abb454f.zip | |
auto merge of #5396 : ILyoan/rust/fix_rt_tls, r=graydon
Add a conditional compile option for android
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/rt/thread_local_storage.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libcore/rt/thread_local_storage.rs b/src/libcore/rt/thread_local_storage.rs index 5b135ba98ce..e10551b6b89 100644 --- a/src/libcore/rt/thread_local_storage.rs +++ b/src/libcore/rt/thread_local_storage.rs @@ -40,6 +40,7 @@ type pthread_key_t = c_ulong; #[cfg(target_os="linux")] #[cfg(target_os="freebsd")] +#[cfg(target_os="android")] #[allow(non_camel_case_types)] // foreign type type pthread_key_t = c_uint; |