Use safe_f! consistently across platforms

xonatius · xonatius · commit 773f5562ba04 · 2020-09-12T23:38:06.000-07:00
The pr #1870 introduced safe_f! macro, which made some functions like WIFEXITED and WEXITSTATUS const and safe on linux_like platform only, which causes inconsistency when trying to use those functions in crates compiled across multiple platforms, as using unsafe on those functions will generate unused_unsafe warning on linux platforms and lack of unsafe block will fail compilation on non-linux platforms. To avoid the inconsistency, this commit applies the same macro for all the same functions on other platforms too.
diff --git a/src/fuchsia/mod.rs b/src/fuchsia/mod.rs
@@ -3158,42 +3158,6 @@ f! {
         }
     }
 
-    pub fn WIFSTOPPED(status: ::c_int) -> bool {
-        (status & 0xff) == 0x7f
-    }
-
-    pub fn WSTOPSIG(status: ::c_int) -> ::c_int {
-        (status >> 8) & 0xff
-    }
-
-    pub fn WIFCONTINUED(status: ::c_int) -> bool {
-        status == 0xffff
-    }
-
-    pub fn WIFSIGNALED(status: ::c_int) -> bool {
-        ((status & 0x7f) + 1) as i8 >= 2
-    }
-
-    pub fn WTERMSIG(status: ::c_int) -> ::c_int {
-        status & 0x7f
-    }
-
-    pub fn WIFEXITED(status: ::c_int) -> bool {
-        (status & 0x7f) == 0
-    }
-
-    pub fn WEXITSTATUS(status: ::c_int) -> ::c_int {
-        (status >> 8) & 0xff
-    }
-
-    pub fn WCOREDUMP(status: ::c_int) -> bool {
-        (status & 0x80) != 0
-    }
-
-    pub fn QCMD(cmd: ::c_int, type_: ::c_int) -> ::c_int {
-        (cmd << 8) | (type_ & 0x00ff)
-    }
-
     pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () {
         for slot in cpuset.bits.iter_mut() {
             *slot = 0;
@@ -3291,6 +3255,44 @@ f! {
     }
 }
 
+safe_f! {
+    pub {const} fn WIFSTOPPED(status: ::c_int) -> bool {
+        (status & 0xff) == 0x7f
+    }
+
+    pub {const} fn WSTOPSIG(status: ::c_int) -> ::c_int {
+        (status >> 8) & 0xff
+    }
+
+    pub {const} fn WIFCONTINUED(status: ::c_int) -> bool {
+        status == 0xffff
+    }
+
+    pub {const} fn WIFSIGNALED(status: ::c_int) -> bool {
+        ((status & 0x7f) + 1) as i8 >= 2
+    }
+
+    pub {const} fn WTERMSIG(status: ::c_int) -> ::c_int {
+        status & 0x7f
+    }
+
+    pub {const} fn WIFEXITED(status: ::c_int) -> bool {
+        (status & 0x7f) == 0
+    }
+
+    pub {const} fn WEXITSTATUS(status: ::c_int) -> ::c_int {
+        (status >> 8) & 0xff
+    }
+
+    pub {const} fn WCOREDUMP(status: ::c_int) -> bool {
+        (status & 0x80) != 0
+    }
+
+    pub {const} fn QCMD(cmd: ::c_int, type_: ::c_int) -> ::c_int {
+        (cmd << 8) | (type_ & 0x00ff)
+    }
+}
+
 fn __CMSG_LEN(cmsg: *const cmsghdr) -> ::ssize_t {
     ((unsafe { (*cmsg).cmsg_len as ::size_t } + ::mem::size_of::<::c_long>()
         - 1)
@@ -3302,9 +3304,8 @@ fn __CMSG_NEXT(cmsg: *const cmsghdr) -> *mut c_uchar {
 }
 
 fn __MHDR_END(mhdr: *const msghdr) -> *mut c_uchar {
-    unsafe {
-        (*mhdr).msg_control.offset((*mhdr).msg_controllen as isize)
-    }.cast()
+    unsafe { (*mhdr).msg_control.offset((*mhdr).msg_controllen as isize) }
+        .cast()
 }
 
 // EXTERN_FN
diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs
@@ -3241,24 +3241,26 @@ f! {
         (__DARWIN_ALIGN32(::mem::size_of::<::cmsghdr>()) + length as usize)
             as ::c_uint
     }
+}
 
-    pub fn WSTOPSIG(status: ::c_int) -> ::c_int {
+safe_f! {
+    pub {const} fn WSTOPSIG(status: ::c_int) -> ::c_int {
         status >> 8
     }
 
-    pub fn _WSTATUS(status: ::c_int) -> ::c_int {
+    pub {const} fn _WSTATUS(status: ::c_int) -> ::c_int {
         status & 0x7f
     }
 
-    pub fn WIFCONTINUED(status: ::c_int) -> bool {
+    pub {const} fn WIFCONTINUED(status: ::c_int) -> bool {
         _WSTATUS(status) == _WSTOPPED && WSTOPSIG(status) == 0x13
     }
 
-    pub fn WIFSIGNALED(status: ::c_int) -> bool {
+    pub {const} fn WIFSIGNALED(status: ::c_int) -> bool {
         _WSTATUS(status) != _WSTOPPED && _WSTATUS(status) != 0
     }
 
-    pub fn WIFSTOPPED(status: ::c_int) -> bool {
+    pub {const} fn WIFSTOPPED(status: ::c_int) -> bool {
         _WSTATUS(status) == _WSTOPPED && WSTOPSIG(status) != 0x13
     }
 }
diff --git a/src/unix/bsd/freebsdlike/dragonfly/mod.rs b/src/unix/bsd/freebsdlike/dragonfly/mod.rs
@@ -1037,8 +1037,10 @@ f! {
         (_CMSG_ALIGN(::mem::size_of::<::cmsghdr>()) +
             _CMSG_ALIGN(length as usize)) as ::c_uint
     }
+}
 
-    pub fn WIFSIGNALED(status: ::c_int) -> bool {
+safe_f! {
+    pub {const} fn WIFSIGNALED(status: ::c_int) -> bool {
         (status & 0o177) != 0o177 && (status & 0o177) != 0
     }
 }
diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs
@@ -1195,15 +1195,17 @@ f! {
         ::mem::size_of::<sockcred>() + ::mem::size_of::<::gid_t>() * ngrps
     }
 
-    pub fn WIFSIGNALED(status: ::c_int) -> bool {
-        (status & 0o177) != 0o177 && (status & 0o177) != 0 && status != 0x13
-    }
-
     pub fn uname(buf: *mut ::utsname) -> ::c_int {
         __xuname(256, buf as *mut ::c_void)
     }
 }
 
+safe_f! {
+    pub {const} fn WIFSIGNALED(status: ::c_int) -> bool {
+        (status & 0o177) != 0o177 && (status & 0o177) != 0 && status != 0x13
+    }
+}
+
 extern "C" {
     pub fn __error() -> *mut ::c_int;
 
diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs
@@ -1220,16 +1220,16 @@ pub const TIME_ERROR: ::c_int = 5;
 pub const REG_ENOSYS: ::c_int = -1;
 pub const REG_ILLSEQ: ::c_int = 17;
 
-f! {
-    pub fn WIFCONTINUED(status: ::c_int) -> bool {
+safe_f! {
+    pub {const} fn WIFCONTINUED(status: ::c_int) -> bool {
         status == 0x13
     }
 
-    pub fn WSTOPSIG(status: ::c_int) -> ::c_int {
+    pub {const} fn WSTOPSIG(status: ::c_int) -> ::c_int {
         status >> 8
     }
 
-    pub fn WIFSTOPPED(status: ::c_int) -> bool {
+    pub {const} fn WIFSTOPPED(status: ::c_int) -> bool {
         (status & 0o177) == 0o177
     }
 }
diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs
@@ -544,24 +544,26 @@ f! {
             *slot = 0;
         }
     }
+}
 
-    pub fn WTERMSIG(status: ::c_int) -> ::c_int {
+safe_f! {
+    pub {const} fn WTERMSIG(status: ::c_int) -> ::c_int {
         status & 0o177
     }
 
-    pub fn WIFEXITED(status: ::c_int) -> bool {
+    pub {const} fn WIFEXITED(status: ::c_int) -> bool {
         (status & 0o177) == 0
     }
 
-    pub fn WEXITSTATUS(status: ::c_int) -> ::c_int {
+    pub {const} fn WEXITSTATUS(status: ::c_int) -> ::c_int {
         status >> 8
     }
 
-    pub fn WCOREDUMP(status: ::c_int) -> bool {
+    pub {const} fn WCOREDUMP(status: ::c_int) -> bool {
         (status & 0o200) != 0
     }
 
-    pub fn QCMD(cmd: ::c_int, type_: ::c_int) -> ::c_int {
+    pub {const} fn QCMD(cmd: ::c_int, type_: ::c_int) -> ::c_int {
         (cmd << 8) | (type_ & 0x00ff)
     }
 }
diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -1699,29 +1699,13 @@ f! {
             as ::c_uint
     }
 
-    pub fn WSTOPSIG(status: ::c_int) -> ::c_int {
-        status >> 8
-    }
-
-    pub fn WIFSIGNALED(status: ::c_int) -> bool {
-        (status & 0o177) != 0o177 && (status & 0o177) != 0
-    }
-
-    pub fn WIFSTOPPED(status: ::c_int) -> bool {
-        (status & 0o177) == 0o177
-    }
-
     // dirfd() is a macro on netbsd to access
     // the first field of the struct where dirp points to:
     // http://cvsweb.netbsd.org/bsdweb.cgi/src/include/dirent.h?rev=1.36
     pub fn dirfd(dirp: *mut ::DIR) -> ::c_int {
         *(dirp as *const ::c_int)
     }
 
-    pub fn WIFCONTINUED(status: ::c_int) -> bool {
-        status == 0xffff
-    }
-
     pub fn SOCKCREDSIZE(ngrps: usize) -> usize {
         let ngrps = if ngrps > 0 {
             ngrps - 1
@@ -1732,6 +1716,24 @@ f! {
     }
 }
 
+safe_f! {
+    pub {const} fn WSTOPSIG(status: ::c_int) -> ::c_int {
+        status >> 8
+    }
+
+    pub {const} fn WIFSIGNALED(status: ::c_int) -> bool {
+        (status & 0o177) != 0o177 && (status & 0o177) != 0
+    }
+
+    pub {const} fn WIFSTOPPED(status: ::c_int) -> bool {
+        (status & 0o177) == 0o177
+    }
+
+    pub {const} fn WIFCONTINUED(status: ::c_int) -> bool {
+        status == 0xffff
+    }
+}
+
 extern "C" {
     pub fn ntp_adjtime(buf: *mut timex) -> ::c_int;
     pub fn ntp_gettime(buf: *mut ntptimeval) -> ::c_int;
diff --git a/src/unix/bsd/netbsdlike/openbsd/mod.rs b/src/unix/bsd/netbsdlike/openbsd/mod.rs
@@ -1340,7 +1340,7 @@ fn _ALIGN(p: usize) -> usize {
 }
 
 f! {
-    pub fn WIFCONTINUED(status: ::c_int) -> bool {
+    pub {const} fn WIFCONTINUED(status: ::c_int) -> bool {
         status & 0o177777 == 0o177777
     }
 
@@ -1375,16 +1375,18 @@ f! {
         (_ALIGN(::mem::size_of::<::cmsghdr>()) + _ALIGN(length as usize))
             as ::c_uint
     }
+}
 
-    pub fn WSTOPSIG(status: ::c_int) -> ::c_int {
+safe_f! {
+    pub {const} fn WSTOPSIG(status: ::c_int) -> ::c_int {
         status >> 8
     }
 
-    pub fn WIFSIGNALED(status: ::c_int) -> bool {
+    pub {const} fn WIFSIGNALED(status: ::c_int) -> bool {
         (status & 0o177) != 0o177 && (status & 0o177) != 0
     }
 
-    pub fn WIFSTOPPED(status: ::c_int) -> bool {
+    pub {const} fn WIFSTOPPED(status: ::c_int) -> bool {
         (status & 0xff) == 0o177
     }
 }
diff --git a/src/unix/haiku/mod.rs b/src/unix/haiku/mod.rs
@@ -1254,37 +1254,39 @@ f! {
             *slot = 0;
         }
     }
+}
 
-    pub fn WIFEXITED(status: ::c_int) -> bool {
+safe_f! {
+    pub {const} fn WIFEXITED(status: ::c_int) -> bool {
         (status & !0xff) == 0
     }
 
-    pub fn WEXITSTATUS(status: ::c_int) -> ::c_int {
+    pub {const} fn WEXITSTATUS(status: ::c_int) -> ::c_int {
         status & 0xff
     }
 
-    pub fn WIFSIGNALED(status: ::c_int) -> bool {
+    pub {const} fn WIFSIGNALED(status: ::c_int) -> bool {
         ((status >> 8) & 0xff) != 0
     }
 
-    pub fn WTERMSIG(status: ::c_int) -> ::c_int {
+    pub {const} fn WTERMSIG(status: ::c_int) -> ::c_int {
         (status >> 8) & 0xff
     }
 
-    pub fn WIFSTOPPED(status: ::c_int) -> bool {
+    pub {const} fn WIFSTOPPED(status: ::c_int) -> bool {
         ((status >> 16) & 0xff) != 0
     }
 
-    pub fn WSTOPSIG(status: ::c_int) -> ::c_int {
+    pub {const} fn WSTOPSIG(status: ::c_int) -> ::c_int {
         (status >> 16) & 0xff
     }
 
     // actually WIFCORED, but this is used everywhere else
-    pub fn WCOREDUMP(status: ::c_int) -> bool {
+    pub {const} fn WCOREDUMP(status: ::c_int) -> bool {
         (status & 0x10000) != 0
     }
 
-    pub fn WIFCONTINUED(status: ::c_int) -> bool {
+    pub {const} fn WIFCONTINUED(status: ::c_int) -> bool {
         (status & 0x20000) != 0
     }
 }
@@ -1293,7 +1295,11 @@ extern "C" {
     pub fn getrlimit(resource: ::c_int, rlim: *mut ::rlimit) -> ::c_int;
     pub fn setrlimit(resource: ::c_int, rlim: *const ::rlimit) -> ::c_int;
     pub fn getpriority(which: ::c_int, who: id_t) -> ::c_int;
-    pub fn setpriority(which: ::c_int, who: id_t, priority: ::c_int) -> ::c_int;
+    pub fn setpriority(
+        which: ::c_int,
+        who: id_t,
+        priority: ::c_int,
+    ) -> ::c_int;
 
     pub fn utimensat(
         fd: ::c_int,
diff --git a/src/unix/hermit/mod.rs b/src/unix/hermit/mod.rs
@@ -943,16 +943,16 @@ pub const PRIO_PROCESS: ::c_int = 0;
 pub const PRIO_PGRP: ::c_int = 1;
 pub const PRIO_USER: ::c_int = 2;
 
-f! {
-    pub fn WEXITSTATUS(status: ::c_int) -> ::c_int {
+safe_f! {
+    pub {const} fn WEXITSTATUS(status: ::c_int) -> ::c_int {
         (status >> 8) & 0xff
     }
 
-    pub fn WIFEXITED(status: ::c_int) -> bool {
+    pub {const} fn WIFEXITED(status: ::c_int) -> bool {
         (status & 0xff) == 0
     }
 
-    pub fn WTERMSIG(status: ::c_int) -> ::c_int {
+    pub {const} fn WTERMSIG(status: ::c_int) -> ::c_int {
         status & 0x7f
     }
 }
diff --git a/src/unix/redox/mod.rs b/src/unix/redox/mod.rs
diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs
diff --git a/src/unix/uclibc/mod.rs b/src/unix/uclibc/mod.rs
diff --git a/src/vxworks/mod.rs b/src/vxworks/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -3241,24 +3241,26 @@ f! {`
`3241`	`3241`	`(__DARWIN_ALIGN32(::mem::size_of::<::cmsghdr>()) + length as usize)`
`3242`	`3242`	`as ::c_uint`
`3243`	`3243`	`}`
	`3244`	`+}`
`3244`	`3245`
`3245`		`- pub fn WSTOPSIG(status: ::c_int) -> ::c_int {`
	`3246`	`+safe_f! {`
	`3247`	`+ pub {const} fn WSTOPSIG(status: ::c_int) -> ::c_int {`
`3246`	`3248`	`status >> 8`
`3247`	`3249`	`}`
`3248`	`3250`
`3249`		`- pub fn _WSTATUS(status: ::c_int) -> ::c_int {`
	`3251`	`+ pub {const} fn _WSTATUS(status: ::c_int) -> ::c_int {`
`3250`	`3252`	`status & 0x7f`
`3251`	`3253`	`}`
`3252`	`3254`
`3253`		`- pub fn WIFCONTINUED(status: ::c_int) -> bool {`
	`3255`	`+ pub {const} fn WIFCONTINUED(status: ::c_int) -> bool {`
`3254`	`3256`	`_WSTATUS(status) == _WSTOPPED && WSTOPSIG(status) == 0x13`
`3255`	`3257`	`}`
`3256`	`3258`
`3257`		`- pub fn WIFSIGNALED(status: ::c_int) -> bool {`
	`3259`	`+ pub {const} fn WIFSIGNALED(status: ::c_int) -> bool {`
`3258`	`3260`	`_WSTATUS(status) != _WSTOPPED && _WSTATUS(status) != 0`
`3259`	`3261`	`}`
`3260`	`3262`
`3261`		`- pub fn WIFSTOPPED(status: ::c_int) -> bool {`
	`3263`	`+ pub {const} fn WIFSTOPPED(status: ::c_int) -> bool {`
`3262`	`3264`	`_WSTATUS(status) == _WSTOPPED && WSTOPSIG(status) != 0x13`
`3263`	`3265`	`}`
`3264`	`3266`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1037,8 +1037,10 @@ f! {`
`1037`	`1037`	`(_CMSG_ALIGN(::mem::size_of::<::cmsghdr>()) +`
`1038`	`1038`	`_CMSG_ALIGN(length as usize)) as ::c_uint`
`1039`	`1039`	`}`
	`1040`	`+}`
`1040`	`1041`
`1041`		`- pub fn WIFSIGNALED(status: ::c_int) -> bool {`
	`1042`	`+safe_f! {`
	`1043`	`+ pub {const} fn WIFSIGNALED(status: ::c_int) -> bool {`
`1042`	`1044`	`(status & 0o177) != 0o177 && (status & 0o177) != 0`
`1043`	`1045`	`}`
`1044`	`1046`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1195,15 +1195,17 @@ f! {`
`1195`	`1195`	`::mem::size_of::<sockcred>() + ::mem::size_of::<::gid_t>() * ngrps`
`1196`	`1196`	`}`
`1197`	`1197`
`1198`		`- pub fn WIFSIGNALED(status: ::c_int) -> bool {`
`1199`		`- (status & 0o177) != 0o177 && (status & 0o177) != 0 && status != 0x13`
`1200`		`- }`
`1201`		`-`
`1202`	`1198`	`pub fn uname(buf: *mut ::utsname) -> ::c_int {`
`1203`	`1199`	`__xuname(256, buf as *mut ::c_void)`
`1204`	`1200`	`}`
`1205`	`1201`	`}`
`1206`	`1202`
	`1203`	`+safe_f! {`
	`1204`	`+ pub {const} fn WIFSIGNALED(status: ::c_int) -> bool {`
	`1205`	`+ (status & 0o177) != 0o177 && (status & 0o177) != 0 && status != 0x13`
	`1206`	`+ }`
	`1207`	`+}`
	`1208`	`+`
`1207`	`1209`	`extern "C" {`
`1208`	`1210`	`pub fn __error() -> *mut ::c_int;`
`1209`	`1211`
Original file line number	Diff line number	Diff line change
`@@ -1220,16 +1220,16 @@ pub const TIME_ERROR: ::c_int = 5;`
`1220`	`1220`	`pub const REG_ENOSYS: ::c_int = -1;`
`1221`	`1221`	`pub const REG_ILLSEQ: ::c_int = 17;`
`1222`	`1222`
`1223`		`-f! {`
`1224`		`- pub fn WIFCONTINUED(status: ::c_int) -> bool {`
	`1223`	`+safe_f! {`
	`1224`	`+ pub {const} fn WIFCONTINUED(status: ::c_int) -> bool {`
`1225`	`1225`	`status == 0x13`
`1226`	`1226`	`}`
`1227`	`1227`
`1228`		`- pub fn WSTOPSIG(status: ::c_int) -> ::c_int {`
	`1228`	`+ pub {const} fn WSTOPSIG(status: ::c_int) -> ::c_int {`
`1229`	`1229`	`status >> 8`
`1230`	`1230`	`}`
`1231`	`1231`
`1232`		`- pub fn WIFSTOPPED(status: ::c_int) -> bool {`
	`1232`	`+ pub {const} fn WIFSTOPPED(status: ::c_int) -> bool {`
`1233`	`1233`	`(status & 0o177) == 0o177`
`1234`	`1234`	`}`
`1235`	`1235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -544,24 +544,26 @@ f! {`
`544`	`544`	`*slot = 0;`
`545`	`545`	`}`
`546`	`546`	`}`
	`547`	`+}`
`547`	`548`
`548`		`- pub fn WTERMSIG(status: ::c_int) -> ::c_int {`
	`549`	`+safe_f! {`
	`550`	`+ pub {const} fn WTERMSIG(status: ::c_int) -> ::c_int {`
`549`	`551`	`status & 0o177`
`550`	`552`	`}`
`551`	`553`
`552`		`- pub fn WIFEXITED(status: ::c_int) -> bool {`
	`554`	`+ pub {const} fn WIFEXITED(status: ::c_int) -> bool {`
`553`	`555`	`(status & 0o177) == 0`
`554`	`556`	`}`
`555`	`557`
`556`		`- pub fn WEXITSTATUS(status: ::c_int) -> ::c_int {`
	`558`	`+ pub {const} fn WEXITSTATUS(status: ::c_int) -> ::c_int {`
`557`	`559`	`status >> 8`
`558`	`560`	`}`
`559`	`561`
`560`		`- pub fn WCOREDUMP(status: ::c_int) -> bool {`
	`562`	`+ pub {const} fn WCOREDUMP(status: ::c_int) -> bool {`
`561`	`563`	`(status & 0o200) != 0`
`562`	`564`	`}`
`563`	`565`
`564`		`- pub fn QCMD(cmd: ::c_int, type_: ::c_int) -> ::c_int {`
	`566`	`+ pub {const} fn QCMD(cmd: ::c_int, type_: ::c_int) -> ::c_int {`
`565`	`567`	`(cmd << 8) \| (type_ & 0x00ff)`
`566`	`568`	`}`
`567`	`569`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1340,7 +1340,7 @@ fn _ALIGN(p: usize) -> usize {`
`1340`	`1340`	`}`
`1341`	`1341`
`1342`	`1342`	`f! {`
`1343`		`- pub fn WIFCONTINUED(status: ::c_int) -> bool {`
	`1343`	`+ pub {const} fn WIFCONTINUED(status: ::c_int) -> bool {`
`1344`	`1344`	`status & 0o177777 == 0o177777`
`1345`	`1345`	`}`
`1346`	`1346`
`@@ -1375,16 +1375,18 @@ f! {`
`1375`	`1375`	`(_ALIGN(::mem::size_of::<::cmsghdr>()) + _ALIGN(length as usize))`
`1376`	`1376`	`as ::c_uint`
`1377`	`1377`	`}`
	`1378`	`+}`
`1378`	`1379`
`1379`		`- pub fn WSTOPSIG(status: ::c_int) -> ::c_int {`
	`1380`	`+safe_f! {`
	`1381`	`+ pub {const} fn WSTOPSIG(status: ::c_int) -> ::c_int {`
`1380`	`1382`	`status >> 8`
`1381`	`1383`	`}`
`1382`	`1384`
`1383`		`- pub fn WIFSIGNALED(status: ::c_int) -> bool {`
	`1385`	`+ pub {const} fn WIFSIGNALED(status: ::c_int) -> bool {`
`1384`	`1386`	`(status & 0o177) != 0o177 && (status & 0o177) != 0`
`1385`	`1387`	`}`
`1386`	`1388`
`1387`		`- pub fn WIFSTOPPED(status: ::c_int) -> bool {`
	`1389`	`+ pub {const} fn WIFSTOPPED(status: ::c_int) -> bool {`
`1388`	`1390`	`(status & 0xff) == 0o177`
`1389`	`1391`	`}`
`1390`	`1392`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1254,37 +1254,39 @@ f! {`
`1254`	`1254`	`*slot = 0;`
`1255`	`1255`	`}`
`1256`	`1256`	`}`
	`1257`	`+}`
`1257`	`1258`
`1258`		`- pub fn WIFEXITED(status: ::c_int) -> bool {`
	`1259`	`+safe_f! {`
	`1260`	`+ pub {const} fn WIFEXITED(status: ::c_int) -> bool {`
`1259`	`1261`	`(status & !0xff) == 0`
`1260`	`1262`	`}`
`1261`	`1263`
`1262`		`- pub fn WEXITSTATUS(status: ::c_int) -> ::c_int {`
	`1264`	`+ pub {const} fn WEXITSTATUS(status: ::c_int) -> ::c_int {`
`1263`	`1265`	`status & 0xff`
`1264`	`1266`	`}`
`1265`	`1267`
`1266`		`- pub fn WIFSIGNALED(status: ::c_int) -> bool {`
	`1268`	`+ pub {const} fn WIFSIGNALED(status: ::c_int) -> bool {`
`1267`	`1269`	`((status >> 8) & 0xff) != 0`
`1268`	`1270`	`}`
`1269`	`1271`
`1270`		`- pub fn WTERMSIG(status: ::c_int) -> ::c_int {`
	`1272`	`+ pub {const} fn WTERMSIG(status: ::c_int) -> ::c_int {`
`1271`	`1273`	`(status >> 8) & 0xff`
`1272`	`1274`	`}`
`1273`	`1275`
`1274`		`- pub fn WIFSTOPPED(status: ::c_int) -> bool {`
	`1276`	`+ pub {const} fn WIFSTOPPED(status: ::c_int) -> bool {`
`1275`	`1277`	`((status >> 16) & 0xff) != 0`
`1276`	`1278`	`}`
`1277`	`1279`
`1278`		`- pub fn WSTOPSIG(status: ::c_int) -> ::c_int {`
	`1280`	`+ pub {const} fn WSTOPSIG(status: ::c_int) -> ::c_int {`
`1279`	`1281`	`(status >> 16) & 0xff`
`1280`	`1282`	`}`
`1281`	`1283`
`1282`	`1284`	`// actually WIFCORED, but this is used everywhere else`
`1283`		`- pub fn WCOREDUMP(status: ::c_int) -> bool {`
	`1285`	`+ pub {const} fn WCOREDUMP(status: ::c_int) -> bool {`
`1284`	`1286`	`(status & 0x10000) != 0`
`1285`	`1287`	`}`
`1286`	`1288`
`1287`		`- pub fn WIFCONTINUED(status: ::c_int) -> bool {`
	`1289`	`+ pub {const} fn WIFCONTINUED(status: ::c_int) -> bool {`
`1288`	`1290`	`(status & 0x20000) != 0`
`1289`	`1291`	`}`
`1290`	`1292`	`}`
`@@ -1293,7 +1295,11 @@ extern "C" {`
`1293`	`1295`	`pub fn getrlimit(resource: ::c_int, rlim: *mut ::rlimit) -> ::c_int;`
`1294`	`1296`	`pub fn setrlimit(resource: ::c_int, rlim: *const ::rlimit) -> ::c_int;`
`1295`	`1297`	`pub fn getpriority(which: ::c_int, who: id_t) -> ::c_int;`
`1296`		`- pub fn setpriority(which: ::c_int, who: id_t, priority: ::c_int) -> ::c_int;`
	`1298`	`+ pub fn setpriority(`
	`1299`	`+ which: ::c_int,`
	`1300`	`+ who: id_t,`
	`1301`	`+ priority: ::c_int,`
	`1302`	`+ ) -> ::c_int;`
`1297`	`1303`
`1298`	`1304`	`pub fn utimensat(`
`1299`	`1305`	`fd: ::c_int,`
Original file line number	Diff line number	Diff line change
`@@ -943,16 +943,16 @@ pub const PRIO_PROCESS: ::c_int = 0;`
`943`	`943`	`pub const PRIO_PGRP: ::c_int = 1;`
`944`	`944`	`pub const PRIO_USER: ::c_int = 2;`
`945`	`945`
`946`		`-f! {`
`947`		`- pub fn WEXITSTATUS(status: ::c_int) -> ::c_int {`
	`946`	`+safe_f! {`
	`947`	`+ pub {const} fn WEXITSTATUS(status: ::c_int) -> ::c_int {`
`948`	`948`	`(status >> 8) & 0xff`
`949`	`949`	`}`
`950`	`950`
`951`		`- pub fn WIFEXITED(status: ::c_int) -> bool {`
	`951`	`+ pub {const} fn WIFEXITED(status: ::c_int) -> bool {`
`952`	`952`	`(status & 0xff) == 0`
`953`	`953`	`}`
`954`	`954`
`955`		`- pub fn WTERMSIG(status: ::c_int) -> ::c_int {`
	`955`	`+ pub {const} fn WTERMSIG(status: ::c_int) -> ::c_int {`
`956`	`956`	`status & 0x7f`
`957`	`957`	`}`
`958`	`958`	`}`