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

1 files changed, 2 insertions, 2 deletions

diff --git a/firmware/asm/memset.c b/firmware/asm/memset.c
index 7b8d2137e8..967a973c5d 100644
--- a/firmware/asm/memset.c
+++ b/firmware/asm/memset.c
@@ -37,7 +37,7 @@ QUICKREF
 #include "_ansi.h"
 
 #define LBLOCKSIZE (sizeof(long))
-#define UNALIGNED(X)   ((long)X & (LBLOCKSIZE - 1))
+#define ROCKBOX_UNALIGNED(X)   ((long)X & (LBLOCKSIZE - 1))
 #define TOO_SMALL(LEN) ((LEN) < LBLOCKSIZE)
 
 _PTR 
@@ -61,7 +61,7 @@ _DEFUN (memset, (m, c, n),
   unsigned long buffer;
   unsigned long *aligned_addr;
 
-  if (!TOO_SMALL (n) && !UNALIGNED (m))
+  if (!TOO_SMALL (n) && !ROCKBOX_UNALIGNED (m))
     {
       /* If we get this far, we know that n is large and m is word-aligned. */