[Scummvm-cvs-logs] scummvm master -> 3a4507bf5a3fd29fe097b2c65a2b47992219fc43

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3a4507bf5a MORTEVIELLE: Fix compilation on WinCE.


Commit: 3a4507bf5a3fd29fe097b2c65a2b47992219fc43
    https://github.com/scummvm/scummvm/commit/3a4507bf5a3fd29fe097b2c65a2b47992219fc43
Author: D G Turner (digitall at scummvm.org)
Date: 2013-07-30T12:53:07-07:00

Commit Message:
MORTEVIELLE: Fix compilation on WinCE.

The LANG_* symbols were colliding with defined symbols in the WinCE
system headers. Renamed to avoid this.

Changed paths:
    engines/mortevielle/mortevielle.cpp
    engines/mortevielle/mortevielle.h



diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index b4b46a4..2d45923 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 4d07d30..388abbc 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