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/libc/strcpy.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/libc/strcpy.c')
| -rw-r--r-- | firmware/libc/strcpy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/libc/strcpy.c b/firmware/libc/strcpy.c index 035e2bda9e..166a74967d 100644 --- a/firmware/libc/strcpy.c +++ b/firmware/libc/strcpy.c | |||
| @@ -40,7 +40,7 @@ QUICKREF | |||
| 40 | /*SUPPRESS 530*/ | 40 | /*SUPPRESS 530*/ |
| 41 | 41 | ||
| 42 | /* Nonzero if either X or Y is not aligned on a "long" boundary. */ | 42 | /* Nonzero if either X or Y is not aligned on a "long" boundary. */ |
| 43 | #define UNALIGNED(X, Y) \ | 43 | #define ROCKBOX_UNALIGNED(X, Y) \ |
| 44 | (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) | 44 | (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) |
| 45 | 45 | ||
| 46 | #if LONG_MAX == 2147483647L | 46 | #if LONG_MAX == 2147483647L |
| @@ -77,7 +77,7 @@ _DEFUN (strcpy, (dst0, src0), | |||
| 77 | _CONST long *aligned_src; | 77 | _CONST long *aligned_src; |
| 78 | 78 | ||
| 79 | /* If SRC or DEST is unaligned, then copy bytes. */ | 79 | /* If SRC or DEST is unaligned, then copy bytes. */ |
| 80 | if (!UNALIGNED (src, dst)) | 80 | if (!ROCKBOX_UNALIGNED (src, dst)) |
| 81 | { | 81 | { |
| 82 | aligned_dst = (long*)dst; | 82 | aligned_dst = (long*)dst; |
| 83 | aligned_src = (long*)src; | 83 | aligned_src = (long*)src; |