diff options
| author | bors <bors@rust-lang.org> | 2017-06-05 21:42:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-05 21:42:19 +0000 |
| commit | ae7920153331f26f2bc144f62082e95e74c2ba31 (patch) | |
| tree | bd9858c105321f5b6335522882ec715c1d6c1f04 /src/libstd | |
| parent | d015610db7b7d30f3c92d3272ce166397a81349e (diff) | |
| parent | 4e2a43f323a87e751b1cc1eaffe4e72eb200146f (diff) | |
| download | rust-ae7920153331f26f2bc144f62082e95e74c2ba31.tar.gz rust-ae7920153331f26f2bc144f62082e95e74c2ba31.zip | |
Auto merge of #42452 - raphlinus:mx_job_default, r=alexcrichton
[fuchsia] Track change of mx_job_default The implementation of mx_job_default changed from a macro which accessed the __magenta_job_default global variable to a proper function call. This patch tracks that change.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/unix/process/magenta.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libstd/sys/unix/process/magenta.rs b/src/libstd/sys/unix/process/magenta.rs index 5b5e29c0374..ab609126cdb 100644 --- a/src/libstd/sys/unix/process/magenta.rs +++ b/src/libstd/sys/unix/process/magenta.rs @@ -102,7 +102,7 @@ pub struct mx_info_process_t { } extern { - static __magenta_job_default: mx_handle_t; + pub fn mx_job_default() -> mx_handle_t; pub fn mx_task_kill(handle: mx_handle_t) -> mx_status_t; @@ -119,10 +119,6 @@ extern { avail: *mut mx_size_t) -> mx_status_t; } -pub fn mx_job_default() -> mx_handle_t { - unsafe { return __magenta_job_default; } -} - // From `enum special_handles` in system/ulib/launchpad/launchpad.c // HND_LOADER_SVC = 0 // HND_EXEC_VMO = 1 |