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/strncmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'firmware/libc/strncmp.c') diff --git a/firmware/libc/strncmp.c b/firmware/libc/strncmp.c index 315fae810a..83e8d5b457 100644 --- a/firmware/libc/strncmp.c +++ b/firmware/libc/strncmp.c @@ -41,7 +41,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))) /* DETECTNULL returns nonzero if (long)X contains a NULL byte. */ @@ -86,7 +86,7 @@ _DEFUN (strncmp, (s1, s2, n), return 0; /* If s1 or s2 are unaligned, then compare bytes. */ - if (!UNALIGNED (s1, s2)) + if (!ROCKBOX_UNALIGNED (s1, s2)) { /* If s1 and s2 are word-aligned, compare them a word at a time. */ a1 = (unsigned long*)s1; -- cgit v1.2.3