Skip to content

Commit 501d93f

Browse files
committed
Auto merge of rust-lang#129 - pftbest:memset, r=japaric
Fix memset arguments for MSP430 target. On MSP430 second argument to memset has `i16` type instead of `i32`.
2 parents 568df8f + 9897bfb commit 501d93f

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/mem.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
#[allow(warnings)]
2+
#[cfg(target_pointer_width = "16")]
3+
type c_int = i16;
4+
#[allow(warnings)]
5+
#[cfg(not(target_pointer_width = "16"))]
6+
type c_int = i32;
7+
18
#[no_mangle]
29
pub unsafe extern "C" fn memcpy(dest: *mut u8,
310
src: *const u8,
@@ -35,7 +42,7 @@ pub unsafe extern "C" fn memmove(dest: *mut u8,
3542
}
3643

3744
#[no_mangle]
38-
pub unsafe extern "C" fn memset(s: *mut u8, c: i32, n: usize) -> *mut u8 {
45+
pub unsafe extern "C" fn memset(s: *mut u8, c: c_int, n: usize) -> *mut u8 {
3946
let mut i = 0;
4047
while i < n {
4148
*s.offset(i as isize) = c as u8;

0 commit comments

Comments
 (0)