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 /apps/plugins | |
| 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 'apps/plugins')
| -rw-r--r-- | apps/plugins/lib/strncpy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/plugins/lib/strncpy.c b/apps/plugins/lib/strncpy.c index 8a78b23882..1b552ee15c 100644 --- a/apps/plugins/lib/strncpy.c +++ b/apps/plugins/lib/strncpy.c | |||
| @@ -46,7 +46,7 @@ QUICKREF | |||
| 46 | /*SUPPRESS 530*/ | 46 | /*SUPPRESS 530*/ |
| 47 | 47 | ||
| 48 | /* Nonzero if either X or Y is not aligned on a "long" boundary. */ | 48 | /* Nonzero if either X or Y is not aligned on a "long" boundary. */ |
| 49 | #define UNALIGNED(X, Y) \ | 49 | #define ROCKBOX_UNALIGNED(X, Y) \ |
| 50 | (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) | 50 | (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) |
| 51 | 51 | ||
| 52 | #if LONG_MAX == 2147483647L | 52 | #if LONG_MAX == 2147483647L |
| @@ -95,7 +95,7 @@ _DEFUN (strncpy, (dst0, src0), | |||
| 95 | _CONST long *aligned_src; | 95 | _CONST long *aligned_src; |
| 96 | 96 | ||
| 97 | /* If SRC and DEST is aligned and count large enough, then copy words. */ | 97 | /* If SRC and DEST is aligned and count large enough, then copy words. */ |
| 98 | if (!UNALIGNED (src, dst) && !TOO_SMALL (count)) | 98 | if (!ROCKBOX_UNALIGNED (src, dst) && !TOO_SMALL (count)) |
| 99 | { | 99 | { |
| 100 | aligned_dst = (long*)dst; | 100 | aligned_dst = (long*)dst; |
| 101 | aligned_src = (long*)src; | 101 | aligned_src = (long*)src; |