Skip to content

Commit 0963b7c

Browse files
supersurviveurtgross35
authored andcommitted
Use core::ffi::c_int instead of crate::mem::c_int
1 parent d5775d7 commit 0963b7c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

compiler-builtins/src/mem/impls.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,13 +384,13 @@ pub unsafe fn set_bytes(mut s: *mut u8, c: u8, mut n: usize) {
384384
}
385385

386386
#[inline(always)]
387-
pub unsafe fn compare_bytes(s1: *const u8, s2: *const u8, n: usize) -> crate::mem::c_int {
387+
pub unsafe fn compare_bytes(s1: *const u8, s2: *const u8, n: usize) -> core::ffi::c_int {
388388
let mut i = 0;
389389
while i < n {
390390
let a = *s1.wrapping_add(i);
391391
let b = *s2.wrapping_add(i);
392392
if a != b {
393-
return a as crate::mem::c_int - b as crate::mem::c_int;
393+
return a as core::ffi::c_int - b as core::ffi::c_int;
394394
}
395395
i += 1;
396396
}

compiler-builtins/src/mem/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ intrinsics! {
3737
}
3838

3939
#[mem_builtin]
40-
pub unsafe extern "C" fn memcmp(s1: *const u8, s2: *const u8, n: usize) -> crate::mem::c_int {
40+
pub unsafe extern "C" fn memcmp(s1: *const u8, s2: *const u8, n: usize) -> core::ffi::c_int {
4141
impls::compare_bytes(s1, s2, n)
4242
}
4343

4444
#[mem_builtin]
45-
pub unsafe extern "C" fn bcmp(s1: *const u8, s2: *const u8, n: usize) -> crate::mem::c_int {
45+
pub unsafe extern "C" fn bcmp(s1: *const u8, s2: *const u8, n: usize) -> core::ffi::c_int {
4646
memcmp(s1, s2, n)
4747
}
4848

0 commit comments

Comments
 (0)