From 21fae5e42b232f399c7a7288e439524e74bde766 Mon Sep 17 00:00:00 2001
From: Pawel Kolodziejski <aquadran@users.sourceforge.net>
Date: Sun, 1 May 2011 21:05:45 +0200
Subject: [PATCH] GRIM: SYSTEM_*_ENDIAN -> SCUMM_*_ENDIAN

---
 engines/grim/bitmap.cpp         |  2 +-
 engines/grim/smush/blocky16.cpp | 12 ++++++------
 graphics/tinygl/image_util.cpp  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/engines/grim/bitmap.cpp b/engines/grim/bitmap.cpp
index 8e00dbcbec2..1ffaa05ca3a 100644
--- a/engines/grim/bitmap.cpp
+++ b/engines/grim/bitmap.cpp
@@ -77,7 +77,7 @@ Bitmap::Bitmap(const char *fname, const char *data, int len) :
 			pos += compressed_len + 12;
 		}
 
-#ifdef SYSTEM_BIG_ENDIAN
+#ifdef SCUMM_BIG_ENDIAN
 		if (_format == 1)
 			for (int j = 0; j < _width * _height; ++j) {
 				((uint16 *)_data[i])[j] = SWAP_BYTES_16(((uint16 *)_data[i])[j]);
diff --git a/engines/grim/smush/blocky16.cpp b/engines/grim/smush/blocky16.cpp
index ca77b305666..7e4d76babda 100644
--- a/engines/grim/smush/blocky16.cpp
+++ b/engines/grim/smush/blocky16.cpp
@@ -31,7 +31,7 @@
 
 namespace Grim {
 
-#if defined(SYSTEM_NEED_ALIGNMENT)
+#if defined(SCUMM_NEED_ALIGNMENT)
 
 #define COPY_4X1_LINE(dst, src)			\
 	do {					\
@@ -41,7 +41,7 @@ namespace Grim {
 		(dst)[3] = (src)[3];	\
 	} while (0)
 
-#if defined(SYSTEM_BIG_ENDIAN)
+#if defined(SCUMM_BIG_ENDIAN)
 
 #define WRITE_2X1_LINE(dst, v)		\
 	do {				\
@@ -57,7 +57,7 @@ namespace Grim {
 		(dst)[3] = (byte)((v >>  0) & 0xFF);	\
 	} while (0)
 
-#else /* SYSTEM_BIG_ENDIAN */
+#else /* SCUMM_BIG_ENDIAN */
 
 #define WRITE_2X1_LINE(dst, v)		\
 	do {				\
@@ -75,7 +75,7 @@ namespace Grim {
 
 #endif
 
-#else /* SYSTEM_NEED_ALIGNMENT */
+#else /* SCUMM_NEED_ALIGNMENT */
 
 #define COPY_4X1_LINE(dst, src)			\
 	*(uint32 *)(dst) = *(const uint32 *)(src);
@@ -719,7 +719,7 @@ static void bompDecodeMain(byte *dst, const byte *src, int size) {
 	size /= 2;
 	bompInit(src);
 	while (size--) {
-#ifdef SYSTEM_BIG_ENDIAN
+#ifdef SCUMM_BIG_ENDIAN
 		*(dst + 1) = bompDecode();
 		*(dst + 0) = bompDecode();
 #else
@@ -759,7 +759,7 @@ void Blocky16::decode(byte *dst, const byte *src) {
 
 	switch(src[18]) {
 	case 0:
-#if defined(SYSTEM_BIG_ENDIAN)
+#if defined(SCUMM_BIG_ENDIAN)
 		for (int i = 0; i < _width * _height; i++) {
 			((uint16 *)_curBuf)[i] = READ_LE_UINT16(gfx_data + i * 2);
 		}
diff --git a/graphics/tinygl/image_util.cpp b/graphics/tinygl/image_util.cpp
index 06c5a498b80..a723e477eda 100644
--- a/graphics/tinygl/image_util.cpp
+++ b/graphics/tinygl/image_util.cpp
@@ -14,7 +14,7 @@ void gl_convertRGB_to_5R6G5B8A(unsigned short *pixmap, unsigned char *rgba, int
 	p2 = (unsigned char *)pixmap;
 	for (i = 0; i < n; i++) {
 		unsigned short pixel = ((p[0] & 0xF8) << 8) | ((p[1] & 0xFC) << 3) | ((p[2] & 0xF8) >> 3);
-#ifdef SYSTEM_BIG_ENDIAN
+#ifdef SCUMM_BIG_ENDIAN
 		p2[3 * i + 0] = pixel >> 8;
 		p2[3 * i + 1] = pixel & 0xff;
 #else