From bf894deb06f7a26e3962031cd4e7e53c51e7d87b Mon Sep 17 00:00:00 2001
From: Kostas Nakos
Date: Sun, 1 Mar 2009 19:46:07 +0000
Subject: silence compiler warnings: the names of some tinsel defines were
 shadowing standard winapi defines

svn-id: r39049
---
 engines/tinsel/palette.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'engines/tinsel/palette.h')

diff --git a/engines/tinsel/palette.h b/engines/tinsel/palette.h
index 1d43e6d31f..90edfbb19a 100644
--- a/engines/tinsel/palette.h
+++ b/engines/tinsel/palette.h
@@ -33,11 +33,11 @@ namespace Tinsel {
 
 typedef	uint32	COLORREF;
 
-#define RGB(r,g,b)	((COLORREF)TO_LE_32(((uint8)(r)|((uint16)(g)<<8))|(((uint32)(uint8)(b))<<16)))
+#define TINSEL_RGB(r,g,b)	((COLORREF)TO_LE_32(((uint8)(r)|((uint16)(g)<<8))|(((uint32)(uint8)(b))<<16)))
 
-#define GetRValue(rgb)	((uint8)(FROM_LE_32(rgb)))
-#define GetGValue(rgb)	((uint8)(((uint16)(FROM_LE_32(rgb))) >> 8))
-#define GetBValue(rgb)	((uint8)((FROM_LE_32(rgb))>>16))
+#define TINSEL_GetRValue(rgb)	((uint8)(FROM_LE_32(rgb)))
+#define TINSEL_GetGValue(rgb)	((uint8)(((uint16)(FROM_LE_32(rgb))) >> 8))
+#define TINSEL_GetBValue(rgb)	((uint8)((FROM_LE_32(rgb))>>16))
 
 enum {
 	MAX_COLOURS		= 256,	//!< maximum number of colours - for VGA 256
@@ -57,14 +57,14 @@ enum {
 
 // some common colours
 
-#define	BLACK	(RGB(0, 0, 0))
-#define	WHITE	(RGB(MAX_INTENSITY, MAX_INTENSITY, MAX_INTENSITY))
-#define	RED		(RGB(MAX_INTENSITY, 0, 0))
-#define	GREEN	(RGB(0, MAX_INTENSITY, 0))
-#define	BLUE	(RGB(0, 0, MAX_INTENSITY))
-#define	YELLOW	(RGB(MAX_INTENSITY, MAX_INTENSITY, 0))
-#define	MAGENTA	(RGB(MAX_INTENSITY, 0, MAX_INTENSITY))
-#define	CYAN	(RGB(0, MAX_INTENSITY, MAX_INTENSITY))
+#define	BLACK	(TINSEL_RGB(0, 0, 0))
+#define	WHITE	(TINSEL_RGB(MAX_INTENSITY, MAX_INTENSITY, MAX_INTENSITY))
+#define	RED		(TINSEL_RGB(MAX_INTENSITY, 0, 0))
+#define	GREEN	(TINSEL_RGB(0, MAX_INTENSITY, 0))
+#define	BLUE	(TINSEL_RGB(0, 0, MAX_INTENSITY))
+#define	YELLOW	(TINSEL_RGB(MAX_INTENSITY, MAX_INTENSITY, 0))
+#define	MAGENTA	(TINSEL_RGB(MAX_INTENSITY, 0, MAX_INTENSITY))
+#define	CYAN	(TINSEL_RGB(0, MAX_INTENSITY, MAX_INTENSITY))
 
 
 #include "common/pack-start.h"	// START STRUCT PACKING
-- 
cgit v1.2.3