diff --git a/src/header/fmtmsg/mod.rs b/src/header/fmtmsg/mod.rs index 6d0e9303ce..235ea40068 100644 --- a/src/header/fmtmsg/mod.rs +++ b/src/header/fmtmsg/mod.rs @@ -101,7 +101,7 @@ pub unsafe extern "C" fn fmtmsg( let consolefd: c_int; let mut cs: c_int = 0; unsafe { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &mut cs as *mut c_int); + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &raw mut cs); } let mut cmsg = unsafe { getenv(c"MSGVERB".as_ptr()) }; let errstring: *const c_char = match severity { @@ -165,7 +165,7 @@ pub unsafe extern "C" fn fmtmsg( break; } else { verb |= 1 << i; - cmsg = strchr(cmsg, b':' as _); + cmsg = strchr(cmsg, b':'.into()); if !cmsg.is_null() { cmsg = cmsg.add(1); } diff --git a/src/header/sys_types_internal/mod.rs b/src/header/sys_types_internal/mod.rs index 2367b95ae0..967164a101 100644 --- a/src/header/sys_types_internal/mod.rs +++ b/src/header/sys_types_internal/mod.rs @@ -7,10 +7,10 @@ //! //! for the old specification. +pub use crate::header::bits_time_t::time_t; use crate::platform::types::{ c_char, c_int, c_long, c_longlong, c_uchar, c_uint, c_ulong, c_ulonglong, c_ushort, }; -pub use crate::header::bits_time_t::time_t; /// Used for block sizes. pub type blksize_t = c_long;