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/rt/rust_builtin.cpp | |
| 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/rt/rust_builtin.cpp')
| -rw-r--r-- | src/rt/rust_builtin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 4382e5b22a0..18e5583a330 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -769,7 +769,7 @@ rust_register_exit_function(spawn_fn runner, fn_env_pair *f) { task->kernel->register_exit_function(runner, f); } -extern "C" void * +extern "C" intptr_t* rust_get_global_data_ptr() { rust_task *task = rust_get_current_task(); return &task->kernel->global_data; |