summaryrefslogtreecommitdiffstats
path: root/firmware/libc
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
parent955be5b34af2e6cf374162ea8b4d4451b1644952 (diff)
downloadrockbox-d984725cbf38d0a9e71c866ae61c48ad488373b4.tar.gz
rockbox-d984725cbf38d0a9e71c866ae61c48ad488373b4.tar.bz2
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')
-rw-r--r--firmware/libc/memchr.c4
-rw-r--r--firmware/libc/memcmp.c4
-rw-r--r--firmware/libc/strchr.c4
-rw-r--r--firmware/libc/strcmp.c4
-rw-r--r--firmware/libc/strcpy.c4
-rw-r--r--firmware/libc/strncmp.c4
6 files changed, 12 insertions, 12 deletions
diff --git a/firmware/libc/memchr.c b/firmware/libc/memchr.c
index 8b6b4d69d9..bd99cfbc4d 100644
--- a/firmware/libc/memchr.c
+++ b/firmware/libc/memchr.c
@@ -38,7 +38,7 @@ QUICKREF
#include "_ansi.h" /* for _DEFUN */
/* Nonzero if X is not aligned on a "long" boundary. */
-#define UNALIGNED(X) ((long)X & (sizeof (long) - 1))
+#define ROCKBOX_UNALIGNED(X) ((long)X & (sizeof (long) - 1))
/* How many bytes are loaded each iteration of the word copy loop. */
#define LBLOCKSIZE (sizeof (long))
@@ -82,7 +82,7 @@ _DEFUN (memchr, (s1, i, n),
unsigned long mask,j;
unsigned long *aligned_addr;
- if (!UNALIGNED (s))
+ if (!ROCKBOX_UNALIGNED (s))
{
mask = 0;
for (j = 0; j < LBLOCKSIZE; j++)
diff --git a/firmware/libc/memcmp.c b/firmware/libc/memcmp.c
index c2fa1bf6b7..e2894bb05a 100644
--- a/firmware/libc/memcmp.c
+++ b/firmware/libc/memcmp.c
@@ -40,7 +40,7 @@ QUICKREF
#include "_ansi.h" /* for _DEFUN */
/* Nonzero if either X or Y is not aligned on a "long" boundary. */
-#define UNALIGNED(X, Y) \
+#define ROCKBOX_UNALIGNED(X, Y) \
(((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
/* How many bytes are copied each iteration of the word copy loop. */
@@ -78,7 +78,7 @@ _DEFUN (memcmp, (m1, m2, n),
/* If the size is too small, or either pointer is unaligned,
then we punt to the byte compare loop. Hopefully this will
not turn up in inner loops. */
- if (!TOO_SMALL(n) && !UNALIGNED(s1,s2))
+ if (!TOO_SMALL(n) && !ROCKBOX_UNALIGNED(s1,s2))
{
/* Otherwise, load and compare the blocks of memory one
word at a time. */
diff --git a/firmware/libc/strchr.c b/firmware/libc/strchr.c
index ada6e2d098..425d4a2f7a 100644
--- a/firmware/libc/strchr.c
+++ b/firmware/libc/strchr.c
@@ -38,7 +38,7 @@ QUICKREF
#include "_ansi.h" /* for _DEFUN */
/* Nonzero if X is not aligned on a "long" boundary. */
-#define UNALIGNED(X) ((long)X & (sizeof (long) - 1))
+#define ROCKBOX_UNALIGNED(X) ((long)X & (sizeof (long) - 1))
/* How many bytes are loaded each iteration of the word copy loop. */
#define LBLOCKSIZE (sizeof (long))
@@ -83,7 +83,7 @@ _DEFUN (strchr, (s1, i),
unsigned long mask,j;
unsigned long *aligned_addr;
- if (!UNALIGNED (s))
+ if (!ROCKBOX_UNALIGNED (s))
{
mask = 0;
for (j = 0; j < LBLOCKSIZE; j++)
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
#include "_ansi.h" /* for _DEFUN */
/* Nonzero if either X or Y is not aligned on a "long" boundary. */
-#define UNALIGNED(X, Y) \
+#define ROCKBOX_UNALIGNED(X, Y) \
(((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
/* DETECTNULL returns nonzero if (long)X contains a NULL byte. */
@@ -76,7 +76,7 @@ _DEFUN (strcmp, (s1, s2),
unsigned long *a2;
/* If s1 or s2 are unaligned, then compare bytes. */
- if (!UNALIGNED (s1, s2))
+ if (!ROCKBOX_UNALIGNED (s1, s2))
{
/* If s1 and s2 are word-aligned, compare them a word at a time. */
a1 = (unsigned long*)s1;
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
/*SUPPRESS 530*/
/* Nonzero if either X or Y is not aligned on a "long" boundary. */
-#define UNALIGNED(X, Y) \
+#define ROCKBOX_UNALIGNED(X, Y) \
(((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
#if LONG_MAX == 2147483647L
@@ -77,7 +77,7 @@ _DEFUN (strcpy, (dst0, src0),
_CONST long *aligned_src;
/* If SRC or DEST is unaligned, then copy bytes. */
- if (!UNALIGNED (src, dst))
+ if (!ROCKBOX_UNALIGNED (src, dst))
{
aligned_dst = (long*)dst;
aligned_src = (long*)src;
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
#include "_ansi.h" /* for _DEFUN */
/* Nonzero if either X or Y is not aligned on a "long" boundary. */
-#define UNALIGNED(X, Y) \
+#define ROCKBOX_UNALIGNED(X, Y) \
(((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
/* DETECTNULL returns nonzero if (long)X contains a NULL byte. */
@@ -86,7 +86,7 @@ _DEFUN (strncmp, (s1, s2, n),
return 0;
/* If s1 or s2 are unaligned, then compare bytes. */
- if (!UNALIGNED (s1, s2))
+ if (!ROCKBOX_UNALIGNED (s1, s2))
{
/* If s1 and s2 are word-aligned, compare them a word at a time. */
a1 = (unsigned long*)s1;