@@ -67,8 +67,8 @@ impl Command {
67
67
}
68
68
69
69
// Duplicate the job handle
70
- let mut job_copy: zx_handle_t = zx_HANDLE_INVALID ;
71
- zx_cvt ( zx_handle_duplicate ( job_handle, zx_RIGHT_SAME_RIGHTS , & mut job_copy) ) ?;
70
+ let mut job_copy: zx_handle_t = ZX_HANDLE_INVALID ;
71
+ zx_cvt ( zx_handle_duplicate ( job_handle, ZX_RIGHT_SAME_RIGHTS , & mut job_copy) ) ?;
72
72
// Create a launchpad
73
73
let mut launchpad: * mut launchpad_t = ptr:: null_mut ( ) ;
74
74
zx_cvt ( launchpad_create ( job_copy, self . get_argv ( ) [ 0 ] , & mut launchpad) ) ?;
@@ -82,7 +82,7 @@ impl Command {
82
82
zx_cvt ( launchpad_add_vdso_vmo ( launchpad) ) ?;
83
83
// Load the executable
84
84
zx_cvt ( launchpad_elf_load ( launchpad, launchpad_vmo_from_file ( self . get_argv ( ) [ 0 ] ) ) ) ?;
85
- zx_cvt ( launchpad_load_vdso ( launchpad, zx_HANDLE_INVALID ) ) ?;
85
+ zx_cvt ( launchpad_load_vdso ( launchpad, ZX_HANDLE_INVALID ) ) ?;
86
86
zx_cvt ( launchpad_clone ( launchpad, LP_CLONE_FDIO_ROOT | LP_CLONE_FDIO_CWD ) ) ?;
87
87
88
88
// Clone stdin, stdout, and stderr
@@ -152,9 +152,9 @@ impl Process {
152
152
let mut avail: zx_size_t = 0 ;
153
153
154
154
unsafe {
155
- zx_cvt ( zx_object_wait_one ( self . handle . raw ( ) , zx_TASK_TERMINATED ,
156
- zx_TIME_INFINITE , ptr:: null_mut ( ) ) ) ?;
157
- zx_cvt ( zx_object_get_info ( self . handle . raw ( ) , zx_INFO_PROCESS ,
155
+ zx_cvt ( zx_object_wait_one ( self . handle . raw ( ) , ZX_TASK_TERMINATED ,
156
+ ZX_TIME_INFINITE , ptr:: null_mut ( ) ) ) ?;
157
+ zx_cvt ( zx_object_get_info ( self . handle . raw ( ) , ZX_INFO_PROCESS ,
158
158
& mut proc_info as * mut _ as * mut libc:: c_void ,
159
159
mem:: size_of :: < zx_info_process_t > ( ) , & mut actual,
160
160
& mut avail) ) ?;
@@ -175,7 +175,7 @@ impl Process {
175
175
let mut avail: zx_size_t = 0 ;
176
176
177
177
unsafe {
178
- let status = zx_object_wait_one ( self . handle . raw ( ) , zx_TASK_TERMINATED ,
178
+ let status = zx_object_wait_one ( self . handle . raw ( ) , ZX_TASK_TERMINATED ,
179
179
0 , ptr:: null_mut ( ) ) ;
180
180
match status {
181
181
0 => { } , // Success
@@ -184,7 +184,7 @@ impl Process {
184
184
} ,
185
185
_ => { panic ! ( "Failed to wait on process handle: {}" , status) ; } ,
186
186
}
187
- zx_cvt ( zx_object_get_info ( self . handle . raw ( ) , zx_INFO_PROCESS ,
187
+ zx_cvt ( zx_object_get_info ( self . handle . raw ( ) , ZX_INFO_PROCESS ,
188
188
& mut proc_info as * mut _ as * mut libc:: c_void ,
189
189
mem:: size_of :: < zx_info_process_t > ( ) , & mut actual,
190
190
& mut avail) ) ?;
0 commit comments