summaryrefslogtreecommitdiff
path: root/firmware/libc/strcmp.c
diff options
context:
space:
mode:
authorMatthias Mohr <Rockbox@Mohrenclan.de>2017-01-15 13:29:40 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2017-01-15 21:32:49 +0100
commitd984725cbf38d0a9e71c866ae61c48ad488373b4 (patch)
treefc064f5fa0baf667bbcd09d56bc350fbb2b5a0d9 /firmware/libc/strcmp.c
parent955be5b34af2e6cf374162ea8b4d4451b1644952 (diff)
downloadrockbox-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/strcmp.c')
-rw-r--r--firmware/libc/strcmp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/libc/strcmp.c b/firmware/libc/strcmp.c
index d540fae7dd..c1487dab74 100644
--- a/firmware/libc/strcmp.c
+++ b/firmware/libc/strcmp.c
@@ -40,7 +40,7 @@ QUICKREF
40#include "_ansi.h" /* for _DEFUN */ 40#include "_ansi.h" /* for _DEFUN */
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/* DETECTNULL returns nonzero if (long)X contains a NULL byte. */ 46/* DETECTNULL returns nonzero if (long)X contains a NULL byte. */
@@ -76,7 +76,7 @@ _DEFUN (strcmp, (s1, s2),
76 unsigned long *a2; 76 unsigned long *a2;
77 77
78 /* If s1 or s2 are unaligned, then compare bytes. */ 78 /* If s1 or s2 are unaligned, then compare bytes. */
79 if (!UNALIGNED (s1, s2)) 79 if (!ROCKBOX_UNALIGNED (s1, s2))
80 { 80 {
81 /* If s1 and s2 are word-aligned, compare them a word at a time. */ 81 /* If s1 and s2 are word-aligned, compare them a word at a time. */
82 a1 = (unsigned long*)s1; 82 a1 = (unsigned long*)s1;