From 3a4507bf5a3fd29fe097b2c65a2b47992219fc43 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Tue, 30 Jul 2013 20:53:07 +0100
Subject: MORTEVIELLE: Fix compilation on WinCE.

The LANG_* symbols were colliding with defined symbols in the WinCE
system headers. Renamed to avoid this.
---
 engines/mortevielle/mortevielle.cpp | 8 ++++----
 engines/mortevielle/mortevielle.h   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index b4b46a4286..2d45923032 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -297,17 +297,17 @@ void MortevielleEngine::readStaticStrings(Common::File &f, int dataSize, DataTyp
 	byte desiredLanguageId;
 	switch(getLanguage()) {
 	case Common::EN_ANY:
-		desiredLanguageId = LANG_ENGLISH;
+		desiredLanguageId = MORTDAT_LANG_ENGLISH;
 		break;
 	case Common::FR_FRA:
-		desiredLanguageId = LANG_FRENCH;
+		desiredLanguageId = MORTDAT_LANG_FRENCH;
 		break;
 	case Common::DE_DEU:
-		desiredLanguageId = LANG_GERMAN;
+		desiredLanguageId = MORTDAT_LANG_GERMAN;
 		break;
 	default:
 		warning("Language not supported, switching to English");
-		desiredLanguageId = LANG_ENGLISH;
+		desiredLanguageId = MORTDAT_LANG_ENGLISH;
 		break;
 	}
 
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 4d07d3000f..388abbc50a 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -73,9 +73,9 @@ enum {
 
 // Game languages
 enum {
-	LANG_FRENCH = 0,
-	LANG_ENGLISH = 1,
-	LANG_GERMAN = 2
+	MORTDAT_LANG_FRENCH = 0,
+	MORTDAT_LANG_ENGLISH = 1,
+	MORTDAT_LANG_GERMAN = 2
 };
 
 // Static string list
-- 
cgit v1.2.3