summaryrefslogtreecommitdiff
path: root/firmware/libc/strncmp.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/strncmp.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/strncmp.c')
-rw-r--r--firmware/libc/strncmp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/libc/strncmp.c b/firmware/libc/strncmp.c
index 315fae810a..83e8d5b457 100644
--- a/firmware/libc/strncmp.c
+++ b/firmware/libc/strncmp.c
@@ -41,7 +41,7 @@ QUICKREF
41#include "_ansi.h" /* for _DEFUN */ 41#include "_ansi.h" /* for _DEFUN */
42 42
43/* Nonzero if either X or Y is not aligned on a "long" boundary. */ 43/* Nonzero if either X or Y is not aligned on a "long" boundary. */
44#define UNALIGNED(X, Y) \ 44#define ROCKBOX_UNALIGNED(X, Y) \
45 (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) 45 (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
46 46
47/* DETECTNULL returns nonzero if (long)X contains a NULL byte. */ 47/* DETECTNULL returns nonzero if (long)X contains a NULL byte. */
@@ -86,7 +86,7 @@ _DEFUN (strncmp, (s1, s2, n),
86 return 0; 86 return 0;
87 87
88 /* If s1 or s2 are unaligned, then compare bytes. */ 88 /* If s1 or s2 are unaligned, then compare bytes. */
89 if (!UNALIGNED (s1, s2)) 89 if (!ROCKBOX_UNALIGNED (s1, s2))
90 { 90 {
91 /* If s1 and s2 are word-aligned, compare them a word at a time. */ 91 /* If s1 and s2 are word-aligned, compare them a word at a time. */
92 a1 = (unsigned long*)s1; 92 a1 = (unsigned long*)s1;