From d984725cbf38d0a9e71c866ae61c48ad488373b4 Mon Sep 17 00:00:00 2001 From: Matthias Mohr Date: Sun, 15 Jan 2017 13:29:40 +0100 Subject: Renamed defines UNALIGNED to ROCKBOX_UNALIGNED - UNALIGNED is already defined in mingw environments. Renamed defines of UNALIGNED to ROCKBOX_UNALIGNED so that they don't conflict with definitions in mingw32 cross-compiling environments (defined in _mingw.h). Change-Id: I369848c0f507e6bf5ff9ab4a60663bbbda6edc52 --- firmware/asm/memmove.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'firmware/asm/memmove.c') diff --git a/firmware/asm/memmove.c b/firmware/asm/memmove.c index 5f423964bb..5c2adf20a7 100644 --- a/firmware/asm/memmove.c +++ b/firmware/asm/memmove.c @@ -40,7 +40,7 @@ QUICKREF #include /* Nonzero if either X or Y is not aligned on a "long" boundary. */ -#define UNALIGNED(X, Y) \ +#define ROCKBOX_UNALIGNED(X, Y) \ (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) /* How many bytes are copied each iteration of the 4X unrolled loop. */ @@ -109,7 +109,7 @@ _DEFUN (memmove, (dst_void, src_void, length), /* Use optimizing algorithm for a non-destructive copy to closely match memcpy. If the size is small or either SRC or DST is unaligned, then punt into the byte copy loop. This should be rare. */ - if (!TOO_SMALL(len) && !UNALIGNED (src, dst)) + if (!TOO_SMALL(len) && !ROCKBOX_UNALIGNED (src, dst)) { aligned_dst = (long*)dst; aligned_src = (long*)src; -- cgit v1.2.3