diff options
author | bors <bors@rust-lang.org> | 2019-09-26 00:29:12 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2019-09-26 00:29:12 +0000 |
commit | f6ed4e01e02139dae2efb336c45b657fdec6cf6c (patch) | |
tree | e820592b54809771113e300523f7c43e97285277 /src/vxworks/mod.rs | |
parent | 44a063abff37b5191bc7f14da26e739031f4abc2 (diff) | |
parent | 740ac0c2d0987a7556e1273d5d25e4e7a5ca15e8 (diff) | |
download | rust-libc-f6ed4e01e02139dae2efb336c45b657fdec6cf6c.tar.gz |
Auto merge of #1532 - Wind-River:master_rebase, r=gnzlbg
update rtpSpawn prototype
Diffstat (limited to 'src/vxworks/mod.rs')
-rwxr-xr-x | src/vxworks/mod.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/vxworks/mod.rs b/src/vxworks/mod.rs index 8745cd1653..cc7525c31c 100755 --- a/src/vxworks/mod.rs +++ b/src/vxworks/mod.rs @@ -416,9 +416,10 @@ s_no_extra_traits! { } pub union sa_u_t { - pub sa_handler : Option<unsafe extern "C" fn(::c_int) -> !>, - pub sa_sigaction: Option<unsafe extern "C" fn(::c_int, *mut ::siginfo_t, - *mut ::c_void) -> !>, + pub sa_handler : ::Option<unsafe extern "C" fn(::c_int) -> !>, + pub sa_sigaction: ::Option<unsafe extern "C" fn(::c_int, + *mut ::siginfo_t, + *mut ::c_void) -> !>, } pub union sigval { @@ -2074,8 +2075,8 @@ extern "C" { pub fn rtpInfoGet(rtpId: ::RTP_ID, rtpStruct: *mut ::RTP_DESC) -> ::c_int; pub fn rtpSpawn( pubrtpFileName: *const ::c_char, - argv: *const *const ::c_char, - envp: *const *const ::c_char, + argv: *mut *const ::c_char, + envp: *mut *const ::c_char, priority: ::c_int, uStackSize: ::size_t, options: ::c_int, |