aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortwinaphex2013-04-05 02:56:55 +0200
committertwinaphex2013-04-05 02:56:55 +0200
commitbeef357e370a426ae48298223f471176e329aa9a (patch)
treeb3fd7b27ddcbaa2da74c50e92e18fe16ae65ad1e
parent09e6db4fb1165f1c6034c3e2f6637024bb368e7d (diff)
parent7e443736093de5288ad616be550b47e0072674d2 (diff)
downloadpcsx_rearmed-beef357e370a426ae48298223f471176e329aa9a.tar.gz
pcsx_rearmed-beef357e370a426ae48298223f471176e329aa9a.tar.bz2
pcsx_rearmed-beef357e370a426ae48298223f471176e329aa9a.zip
Merge git://github.com/notaz/pcsx_rearmed
-rw-r--r--libpcsxcore/misc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 3ee794b..874624d 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -57,7 +57,8 @@ void mmssdd( char *b, char *p )
{
int m, s, d;
#if defined(__arm__)
- int block = (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | b[0];
+ unsigned char *u = (void *)b;
+ int block = (u[3] << 24) | (u[2] << 16) | (u[1] << 8) | u[0];
#elif defined(__BIGENDIAN__)
int block = (b[0] & 0xff) | ((b[1] & 0xff) << 8) | ((b[2] & 0xff) << 16) | (b[3] << 24);
#else