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/memset16.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/memset16.c')
| -rw-r--r-- | firmware/asm/memset16.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/asm/memset16.c b/firmware/asm/memset16.c index 7e31df0cdd..db71d86fcc 100644 --- a/firmware/asm/memset16.c +++ b/firmware/asm/memset16.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include "string-extra.h" /* memset16() */ | 22 | #include "string-extra.h" /* memset16() */ |
| 23 | 23 | ||
| 24 | #define LBLOCKSIZE (sizeof(long)/2) | 24 | #define LBLOCKSIZE (sizeof(long)/2) |
| 25 | #define UNALIGNED(X) ((long)X & (sizeof(long) - 1)) | 25 | #define ROCKBOX_UNALIGNED(X) ((long)X & (sizeof(long) - 1)) |
| 26 | #define TOO_SMALL(LEN) ((LEN) < LBLOCKSIZE) | 26 | #define TOO_SMALL(LEN) ((LEN) < LBLOCKSIZE) |
| 27 | 27 | ||
| 28 | void memset16(void *dst, int val, size_t len) | 28 | void memset16(void *dst, int val, size_t len) |
| @@ -38,7 +38,7 @@ void memset16(void *dst, int val, size_t len) | |||
| 38 | unsigned long buffer; | 38 | unsigned long buffer; |
| 39 | unsigned long *aligned_addr; | 39 | unsigned long *aligned_addr; |
| 40 | 40 | ||
| 41 | if (!TOO_SMALL(len) && !UNALIGNED(dst)) | 41 | if (!TOO_SMALL(len) && !ROCKBOX_UNALIGNED(dst)) |
| 42 | { | 42 | { |
| 43 | aligned_addr = (unsigned long *)dst; | 43 | aligned_addr = (unsigned long *)dst; |
| 44 | 44 | ||