diff options
| author | bors <bors@rust-lang.org> | 2013-07-12 21:40:36 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-12 21:40:36 -0700 |
| commit | d582eeb1ec8e77234a26475bd70bf12a933b4efa (patch) | |
| tree | 75a1b85319da4b646fc30e5a4f94d56f943ba172 /src/libstd | |
| parent | d2cf2925943b8de3578eaccd00661ceffdd22d7e (diff) | |
| parent | 2cd9d7bc88dc4e7c2a1fd25325eb95ff781395b7 (diff) | |
| download | rust-d582eeb1ec8e77234a26475bd70bf12a933b4efa.tar.gz rust-d582eeb1ec8e77234a26475bd70bf12a933b4efa.zip | |
auto merge of #7734 : alexcrichton/rust/issue-3395, r=sanxiyn
Also ends up fixing one case in libstd. Closes #3395
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/unstable/global.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/unstable/global.rs b/src/libstd/unstable/global.rs index 285a8114cc2..af28879f739 100644 --- a/src/libstd/unstable/global.rs +++ b/src/libstd/unstable/global.rs @@ -28,7 +28,7 @@ avoid hitting the mutex. use cast::{transmute}; use clone::Clone; use kinds::Send; -use libc::{c_void}; +use libc::{c_void, intptr_t}; use option::{Option, Some, None}; use ops::Drop; use unstable::sync::{Exclusive, exclusive}; @@ -228,7 +228,7 @@ fn key_ptr<T:Send>(key: GlobalDataKey<T>) -> uint { } extern { - fn rust_get_global_data_ptr() -> *mut int; + fn rust_get_global_data_ptr() -> *mut intptr_t; } #[test] |