Skip to content

Commit

Permalink
Fix an android compilation fail
Browse files Browse the repository at this point in the history
  • Loading branch information
ILyoan committed Mar 15, 2013
1 parent 73b253d commit 1a6a37e
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/libcore/rt/thread_local_storage.rs
Expand Up @@ -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;

Expand Down

5 comments on commit 1a6a37e

@bors
Copy link
Contributor

@bors bors commented on 1a6a37e Mar 16, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from graydon
at ILyoan@1a6a37e

@bors
Copy link
Contributor

@bors bors commented on 1a6a37e Mar 16, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging ILyoan/rust/fix_rt_tls = 1a6a37e into auto

@bors
Copy link
Contributor

@bors bors commented on 1a6a37e Mar 16, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ILyoan/rust/fix_rt_tls = 1a6a37e merged ok, testing candidate = 4ad9e5c

@bors
Copy link
Contributor

@bors bors commented on 1a6a37e Mar 16, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 1a6a37e Mar 16, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding incoming to auto = 4ad9e5c

Please sign in to comment.