Skip to content

Commit 643aff5

Browse files
authored
Merge pull request #4081 from tgross35/diff-notes
[0.2] Add more diff notes
2 parents 94be39b + 84597bd commit 643aff5

File tree

13 files changed

+34
-0
lines changed

13 files changed

+34
-0
lines changed

src/fuchsia/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3809,13 +3809,16 @@ extern "C" {
38093809
pub fn execl(path: *const c_char, arg0: *const c_char, ...) -> ::c_int;
38103810
pub fn execle(path: *const ::c_char, arg0: *const ::c_char, ...) -> ::c_int;
38113811
pub fn execlp(file: *const ::c_char, arg0: *const ::c_char, ...) -> ::c_int;
3812+
3813+
// DIFF(main): changed to `*const *mut` in e77f551de9
38123814
pub fn execv(prog: *const c_char, argv: *const *const c_char) -> ::c_int;
38133815
pub fn execve(
38143816
prog: *const c_char,
38153817
argv: *const *const c_char,
38163818
envp: *const *const c_char,
38173819
) -> ::c_int;
38183820
pub fn execvp(c: *const c_char, argv: *const *const c_char) -> ::c_int;
3821+
38193822
pub fn fork() -> pid_t;
38203823
pub fn fpathconf(filedes: ::c_int, name: ::c_int) -> c_long;
38213824
pub fn getcwd(buf: *mut c_char, size: ::size_t) -> *mut c_char;
@@ -4155,6 +4158,8 @@ extern "C" {
41554158
termp: *const termios,
41564159
winp: *const ::winsize,
41574160
) -> ::c_int;
4161+
4162+
// DIFF(main): changed to `*const *mut` in e77f551de9
41584163
pub fn execvpe(
41594164
file: *const ::c_char,
41604165
argv: *const *const ::c_char,

src/unix/aix/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2812,11 +2812,14 @@ extern "C" {
28122812
) -> ::c_int;
28132813
pub fn fattach(fildes: ::c_int, path: *const ::c_char) -> ::c_int;
28142814
pub fn fdatasync(fd: ::c_int) -> ::c_int;
2815+
2816+
// DIFF(main): changed to `*const *mut` in e77f551de9
28152817
pub fn fexecve(
28162818
fd: ::c_int,
28172819
argv: *const *const ::c_char,
28182820
envp: *const *const ::c_char,
28192821
) -> ::c_int;
2822+
28202823
pub fn ffs(value: ::c_int) -> ::c_int;
28212824
pub fn ffsl(value: ::c_long) -> ::c_int;
28222825
pub fn ffsll(value: ::c_longlong) -> ::c_int;

src/unix/bsd/freebsdlike/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,11 +1530,14 @@ extern "C" {
15301530
pub fn duplocale(base: ::locale_t) -> ::locale_t;
15311531
pub fn endutxent();
15321532
pub fn fchflags(fd: ::c_int, flags: ::c_ulong) -> ::c_int;
1533+
1534+
// DIFF(main): changed to `*const *mut` in e77f551de9
15331535
pub fn fexecve(
15341536
fd: ::c_int,
15351537
argv: *const *const ::c_char,
15361538
envp: *const *const ::c_char,
15371539
) -> ::c_int;
1540+
15381541
pub fn futimens(fd: ::c_int, times: *const ::timespec) -> ::c_int;
15391542
pub fn getdomainname(name: *mut ::c_char, len: ::c_int) -> ::c_int;
15401543
pub fn getgrent_r(

src/unix/bsd/netbsdlike/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,11 +755,14 @@ extern "C" {
755755
pub fn shmat(shmid: ::c_int, shmaddr: *const ::c_void, shmflg: ::c_int) -> *mut ::c_void;
756756
pub fn shmdt(shmaddr: *const ::c_void) -> ::c_int;
757757
pub fn shmctl(shmid: ::c_int, cmd: ::c_int, buf: *mut ::shmid_ds) -> ::c_int;
758+
759+
// DIFF(main): changed to `*const *mut` in e77f551de9
758760
pub fn execvpe(
759761
file: *const ::c_char,
760762
argv: *const *const ::c_char,
761763
envp: *const *const ::c_char,
762764
) -> ::c_int;
765+
763766
pub fn waitid(
764767
idtype: idtype_t,
765768
id: ::id_t,

src/unix/haiku/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1842,11 +1842,14 @@ extern "C" {
18421842

18431843
pub fn sendmsg(fd: ::c_int, msg: *const ::msghdr, flags: ::c_int) -> ::ssize_t;
18441844
pub fn recvmsg(fd: ::c_int, msg: *mut ::msghdr, flags: ::c_int) -> ::ssize_t;
1845+
1846+
// DIFF(main): changed to `*const *mut` in e77f551de9
18451847
pub fn execvpe(
18461848
file: *const ::c_char,
18471849
argv: *const *const ::c_char,
18481850
environment: *const *const ::c_char,
18491851
) -> ::c_int;
1852+
18501853
pub fn getgrgid_r(
18511854
gid: ::gid_t,
18521855
grp: *mut ::group,

src/unix/hurd/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4209,6 +4209,8 @@ extern "C" {
42094209
envp: *const *mut c_char,
42104210
flags: ::c_int,
42114211
) -> ::c_int;
4212+
4213+
// DIFF(main): changed to `*const *mut` in e77f551de9
42124214
pub fn execvpe(
42134215
file: *const ::c_char,
42144216
argv: *const *const ::c_char,

src/unix/linux_like/linux/gnu/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,7 @@ pub const ELFOSABI_ARM_AEABI: u8 = 64;
11111111

11121112
// linux/sched.h
11131113
pub const CLONE_NEWTIME: ::c_int = 0x80;
1114+
// DIFF(main): changed to `c_ulonglong` in e9abac9ac2
11141115
pub const CLONE_CLEAR_SIGHAND: ::c_int = 0x100000000;
11151116
pub const CLONE_INTO_CGROUP: ::c_int = 0x200000000;
11161117

src/unix/linux_like/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,6 +1753,8 @@ extern "C" {
17531753
rusage: *mut ::rusage,
17541754
) -> ::pid_t;
17551755
pub fn login_tty(fd: ::c_int) -> ::c_int;
1756+
1757+
// DIFF(main): changed to `*const *mut` in e77f551de9
17561758
pub fn execvpe(
17571759
file: *const ::c_char,
17581760
argv: *const *const ::c_char,
@@ -1763,6 +1765,7 @@ extern "C" {
17631765
argv: *const *const ::c_char,
17641766
envp: *const *const ::c_char,
17651767
) -> ::c_int;
1768+
17661769
pub fn getifaddrs(ifap: *mut *mut ::ifaddrs) -> ::c_int;
17671770
pub fn freeifaddrs(ifa: *mut ::ifaddrs);
17681771
pub fn bind(socket: ::c_int, address: *const ::sockaddr, address_len: ::socklen_t) -> ::c_int;

src/unix/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -904,13 +904,16 @@ extern "C" {
904904
pub fn execl(path: *const c_char, arg0: *const c_char, ...) -> ::c_int;
905905
pub fn execle(path: *const ::c_char, arg0: *const ::c_char, ...) -> ::c_int;
906906
pub fn execlp(file: *const ::c_char, arg0: *const ::c_char, ...) -> ::c_int;
907+
908+
// DIFF(main): changed to `*const *mut` in e77f551de9
907909
pub fn execv(prog: *const c_char, argv: *const *const c_char) -> ::c_int;
908910
pub fn execve(
909911
prog: *const c_char,
910912
argv: *const *const c_char,
911913
envp: *const *const c_char,
912914
) -> ::c_int;
913915
pub fn execvp(c: *const c_char, argv: *const *const c_char) -> ::c_int;
916+
914917
pub fn fork() -> pid_t;
915918
pub fn fpathconf(filedes: ::c_int, name: ::c_int) -> c_long;
916919
pub fn getcwd(buf: *mut c_char, size: ::size_t) -> *mut c_char;

src/unix/newlib/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -873,11 +873,14 @@ extern "C" {
873873
flags: ::c_int,
874874
) -> ::c_int;
875875
pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void;
876+
877+
// DIFF(main): changed to `*const *mut` in e77f551de9
876878
pub fn fexecve(
877879
fd: ::c_int,
878880
argv: *const *const ::c_char,
879881
envp: *const *const ::c_char,
880882
) -> ::c_int;
883+
881884
pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::c_void) -> ::c_int;
882885
pub fn getgrgid_r(
883886
gid: ::gid_t,

0 commit comments

Comments
 (0)