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/libc/memcmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'firmware/libc/memcmp.c') diff --git a/firmware/libc/memcmp.c b/firmware/libc/memcmp.c index c2fa1bf6b7..e2894bb05a 100644 --- a/firmware/libc/memcmp.c +++ b/firmware/libc/memcmp.c @@ -40,7 +40,7 @@ QUICKREF #include "_ansi.h" /* for _DEFUN */ /* 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 word copy loop. */ @@ -78,7 +78,7 @@ _DEFUN (memcmp, (m1, m2, n), /* If the size is too small, or either pointer is unaligned, then we punt to the byte compare loop. Hopefully this will not turn up in inner loops. */ - if (!TOO_SMALL(n) && !UNALIGNED(s1,s2)) + if (!TOO_SMALL(n) && !ROCKBOX_UNALIGNED(s1,s2)) { /* Otherwise, load and compare the blocks of memory one word at a time. */ -- cgit v1.2.3