Skip to content

Commit

Permalink
Auto merge of #42452 - raphlinus:mx_job_default, r=alexcrichton
Browse files Browse the repository at this point in the history
[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.
  • Loading branch information
bors committed Jun 5, 2017
2 parents d015610 + 4e2a43f commit ae79201
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions src/libstd/sys/unix/process/magenta.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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
Expand Down

0 comments on commit ae79201

Please sign in to comment.