Auto merge of #1532 - Wind-River:master_rebase, r=gnzlbg
update rtpSpawn prototype
This commit is contained in:
commit
f6ed4e01e0
|
@ -416,8 +416,9 @@ s_no_extra_traits! {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub union sa_u_t {
|
pub union sa_u_t {
|
||||||
pub sa_handler : Option<unsafe extern "C" fn(::c_int) -> !>,
|
pub sa_handler : ::Option<unsafe extern "C" fn(::c_int) -> !>,
|
||||||
pub sa_sigaction: Option<unsafe extern "C" fn(::c_int, *mut ::siginfo_t,
|
pub sa_sigaction: ::Option<unsafe extern "C" fn(::c_int,
|
||||||
|
*mut ::siginfo_t,
|
||||||
*mut ::c_void) -> !>,
|
*mut ::c_void) -> !>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2074,8 +2075,8 @@ extern "C" {
|
||||||
pub fn rtpInfoGet(rtpId: ::RTP_ID, rtpStruct: *mut ::RTP_DESC) -> ::c_int;
|
pub fn rtpInfoGet(rtpId: ::RTP_ID, rtpStruct: *mut ::RTP_DESC) -> ::c_int;
|
||||||
pub fn rtpSpawn(
|
pub fn rtpSpawn(
|
||||||
pubrtpFileName: *const ::c_char,
|
pubrtpFileName: *const ::c_char,
|
||||||
argv: *const *const ::c_char,
|
argv: *mut *const ::c_char,
|
||||||
envp: *const *const ::c_char,
|
envp: *mut *const ::c_char,
|
||||||
priority: ::c_int,
|
priority: ::c_int,
|
||||||
uStackSize: ::size_t,
|
uStackSize: ::size_t,
|
||||||
options: ::c_int,
|
options: ::c_int,
|
||||||
|
|
Loading…
Reference in New Issue