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/strlen.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/strlen.c')
| -rw-r--r-- | firmware/asm/strlen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/asm/strlen.c b/firmware/asm/strlen.c index 649df6764b..d5326584b5 100644 --- a/firmware/asm/strlen.c +++ b/firmware/asm/strlen.c | |||
| @@ -37,7 +37,7 @@ QUICKREF | |||
| 37 | #include <limits.h> | 37 | #include <limits.h> |
| 38 | 38 | ||
| 39 | #define LBLOCKSIZE (sizeof (long)) | 39 | #define LBLOCKSIZE (sizeof (long)) |
| 40 | #define UNALIGNED(X) ((long)X & (LBLOCKSIZE - 1)) | 40 | #define ROCKBOX_UNALIGNED(X) ((long)X & (LBLOCKSIZE - 1)) |
| 41 | 41 | ||
| 42 | #if LONG_MAX == 2147483647L | 42 | #if LONG_MAX == 2147483647L |
| 43 | #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) | 43 | #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) |
| @@ -73,7 +73,7 @@ _DEFUN (strlen, (str), | |||
| 73 | _CONST char *start = str; | 73 | _CONST char *start = str; |
| 74 | unsigned long *aligned_addr; | 74 | unsigned long *aligned_addr; |
| 75 | 75 | ||
| 76 | if (!UNALIGNED (str)) | 76 | if (!ROCKBOX_UNALIGNED (str)) |
| 77 | { | 77 | { |
| 78 | /* If the string is word-aligned, we can check for the presence of | 78 | /* If the string is word-aligned, we can check for the presence of |
| 79 | a null in each word-sized block. */ | 79 | a null in each word-sized block. */ |