Skip to content

Commit 0dbadb4

Browse files
committed
Auto merge of #3382 - devnexen:netbsd_openbsd_merge, r=JohnTitor
openbsd/netbsd sharing execvpe definition
2 parents 78301e2 + d0d846d commit 0dbadb4

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

src/unix/bsd/netbsdlike/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -736,6 +736,11 @@ extern "C" {
736736
pub fn shmat(shmid: ::c_int, shmaddr: *const ::c_void, shmflg: ::c_int) -> *mut ::c_void;
737737
pub fn shmdt(shmaddr: *const ::c_void) -> ::c_int;
738738
pub fn shmctl(shmid: ::c_int, cmd: ::c_int, buf: *mut ::shmid_ds) -> ::c_int;
739+
pub fn execvpe(
740+
file: *const ::c_char,
741+
argv: *const *const ::c_char,
742+
envp: *const *const ::c_char,
743+
) -> ::c_int;
739744
}
740745

741746
extern "C" {

src/unix/bsd/netbsdlike/netbsd/mod.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2533,12 +2533,6 @@ extern "C" {
25332533
pub fn fchflags(fd: ::c_int, flags: ::c_ulong) -> ::c_int;
25342534
pub fn lchflags(path: *const ::c_char, flags: ::c_ulong) -> ::c_int;
25352535

2536-
pub fn execvpe(
2537-
file: *const ::c_char,
2538-
argv: *const *const ::c_char,
2539-
envp: *const *const ::c_char,
2540-
) -> ::c_int;
2541-
25422536
pub fn extattr_list_fd(
25432537
fd: ::c_int,
25442538
attrnamespace: ::c_int,

src/unix/bsd/netbsdlike/openbsd/mod.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1779,11 +1779,6 @@ safe_f! {
17791779
extern "C" {
17801780
pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::timezone) -> ::c_int;
17811781
pub fn settimeofday(tp: *const ::timeval, tz: *const ::timezone) -> ::c_int;
1782-
pub fn execvpe(
1783-
file: *const ::c_char,
1784-
argv: *const *const ::c_char,
1785-
envp: *const *const ::c_char,
1786-
) -> ::c_int;
17871782
pub fn pledge(promises: *const ::c_char, execpromises: *const ::c_char) -> ::c_int;
17881783
pub fn unveil(path: *const ::c_char, permissions: *const ::c_char) -> ::c_int;
17891784
pub fn strtonum(

0 commit comments

Comments
 (0)