diff options
author | Matthias Mohr <Rockbox@Mohrenclan.de> | 2017-01-15 13:29:40 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2017-01-15 21:32:49 +0100 |
commit | d984725cbf38d0a9e71c866ae61c48ad488373b4 (patch) | |
tree | fc064f5fa0baf667bbcd09d56bc350fbb2b5a0d9 /firmware/asm/memcpy.c | |
parent | 955be5b34af2e6cf374162ea8b4d4451b1644952 (diff) | |
download | rockbox-d984725cbf38d0a9e71c866ae61c48ad488373b4.tar.gz rockbox-d984725cbf38d0a9e71c866ae61c48ad488373b4.zip |
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
Diffstat (limited to 'firmware/asm/memcpy.c')
-rw-r--r-- | firmware/asm/memcpy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/asm/memcpy.c b/firmware/asm/memcpy.c index c5456ab41f..df78eea883 100644 --- a/firmware/asm/memcpy.c +++ b/firmware/asm/memcpy.c | |||
@@ -37,7 +37,7 @@ QUICKREF | |||
37 | #include <string.h> | 37 | #include <string.h> |
38 | 38 | ||
39 | /* Nonzero if either X or Y is not aligned on a "long" boundary. */ | 39 | /* Nonzero if either X or Y is not aligned on a "long" boundary. */ |
40 | #define UNALIGNED(X, Y) \ | 40 | #define ROCKBOX_UNALIGNED(X, Y) \ |
41 | (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) | 41 | (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) |
42 | 42 | ||
43 | /* How many bytes are copied each iteration of the 4X unrolled loop. */ | 43 | /* How many bytes are copied each iteration of the 4X unrolled loop. */ |
@@ -82,7 +82,7 @@ _DEFUN (memcpy, (dst0, src0, len0), | |||
82 | 82 | ||
83 | /* If the size is small, or either SRC or DST is unaligned, | 83 | /* If the size is small, or either SRC or DST is unaligned, |
84 | then punt into the byte copy loop. This should be rare. */ | 84 | then punt into the byte copy loop. This should be rare. */ |
85 | if (!TOO_SMALL(len) && !UNALIGNED (src, dst)) | 85 | if (!TOO_SMALL(len) && !ROCKBOX_UNALIGNED (src, dst)) |
86 | { | 86 | { |
87 | aligned_dst = (long*)dst; | 87 | aligned_dst = (long*)dst; |
88 | aligned_src = (long*)src; | 88 | aligned_src = (long*)src; |