user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #7734 : alexcrichton/rust/issue-3395, r=sanxiyn

Browse source 
Also ends up fixing one case in libstd. 

Closes #3395
This commit is contained in:
bors 2013-07-12 21:40:36 -07:00
commit d582eeb1ec
6 changed files with 16 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstd/unstable/global.rs
View file

@ -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]