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/memchr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'firmware/libc/memchr.c') diff --git a/firmware/libc/memchr.c b/firmware/libc/memchr.c index 8b6b4d69d9..bd99cfbc4d 100644 --- a/firmware/libc/memchr.c +++ b/firmware/libc/memchr.c @@ -38,7 +38,7 @@ QUICKREF #include "_ansi.h" /* for _DEFUN */ /* Nonzero if X is not aligned on a "long" boundary. */ -#define UNALIGNED(X) ((long)X & (sizeof (long) - 1)) +#define ROCKBOX_UNALIGNED(X) ((long)X & (sizeof (long) - 1)) /* How many bytes are loaded each iteration of the word copy loop. */ #define LBLOCKSIZE (sizeof (long)) @@ -82,7 +82,7 @@ _DEFUN (memchr, (s1, i, n), unsigned long mask,j; unsigned long *aligned_addr; - if (!UNALIGNED (s)) + if (!ROCKBOX_UNALIGNED (s)) { mask = 0; for (j = 0; j < LBLOCKSIZE; j++) -- cgit v1.2.3