Skip to content

remove rtp.rs, and move rtpSpawn and RTP_ID_ERROR to libc #64720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 25, 2019
Merged

remove rtp.rs, and move rtpSpawn and RTP_ID_ERROR to libc #64720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4dd4da9
remove directory libstd/sys/vxworks/backtrace which is not used any more
bpangWR Aug 30, 2019
2753233
Merge pull request #28 from rust-lang/master
BaoshanPang Sep 23, 2019
cd88dae
Merge pull request #26 from rust-lang/master
n-salim Sep 23, 2019
b548814
remove rtp.rs, and move rtpSpawn and RTP_ID_ERROR to libc
bpangWR Sep 23, 2019
75ecbe2
Merge pull request #29 from Wind-River/cleanup
n-salim Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/libstd/sys/vxworks/process/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ pub use crate::ffi::OsString as EnvKey;
mod process_common;
#[path = "process_vxworks.rs"]
mod process_inner;
mod rtp;
5 changes: 2 additions & 3 deletions src/libstd/sys/vxworks/process/process_vxworks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use libc::{self, c_int, c_char};
use libc::{RTP_ID};
use crate::sys;
use crate::sys::cvt;
use crate::sys::process::rtp;
use crate::sys::process::process_common::*;
use crate::sys_common::thread;

Expand Down Expand Up @@ -53,7 +52,7 @@ impl Command {
t!(cvt(libc::chdir(cwd.as_ptr())));
}

let ret = rtp::rtpSpawn(
let ret = libc::rtpSpawn(
self.get_argv()[0], // executing program
self.get_argv().as_ptr() as *const _, // argv
*sys::os::environ() as *const *const c_char,
Expand All @@ -78,7 +77,7 @@ impl Command {
libc::close(orig_stderr);
}

if ret != rtp::RTP_ID_ERROR {
if ret != libc::RTP_ID_ERROR {
p.pid = ret;
Ok((p, ours))
} else {
Expand Down
298 changes: 0 additions & 298 deletions src/libstd/sys/vxworks/process/rtp.rs
View file
Open in desktop

This file was deleted.