1
0
Fork 0
forked from len0rd/rockbox

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
This commit is contained in:
Matthias Mohr 2017-01-15 13:29:40 +01:00 committed by Amaury Pouly
parent 955be5b34a
commit d984725cbf
12 changed files with 24 additions and 24 deletions

View file

@ -46,7 +46,7 @@ QUICKREF
/*SUPPRESS 530*/
/* 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)))
#if LONG_MAX == 2147483647L
@ -95,7 +95,7 @@ _DEFUN (strncpy, (dst0, src0),
_CONST long *aligned_src;
/* If SRC and DEST is aligned and count large enough, then copy words. */
if (!UNALIGNED (src, dst) && !TOO_SMALL (count))
if (!ROCKBOX_UNALIGNED (src, dst) && !TOO_SMALL (count))
{
aligned_dst = (long*)dst;
aligned_src = (long*)src;