Change PalmOS ident and fix ARM bug using global initializers

svn-id: r18744

2 files changed, 17 insertions, 2 deletions

diff --git a/common/config-manager.cpp b/common/config-manager.cpp
index 49bc3f062c..9302b6d680 100644
--- a/common/config-manager.cpp
+++ b/common/config-manager.cpp
@@ -62,12 +62,23 @@ static bool isValidDomainName(const Common::String &domain) {
 
 namespace Common {
 
+#ifndef PALMOS_ARM
+
 const String ConfigManager::kApplicationDomain("scummvm");
 const String ConfigManager::kTransientDomain("__TRANSIENT");
 
 const String trueStr("true");
 const String falseStr("false");
 
+#else
+
+const char *ConfigManager::kApplicationDomain = "scummvm";
+const char *ConfigManager::kTransientDomain = "__TRANSIENT";
+
+const char *trueStr = "true";
+const char *falseStr = "false";
+
+#endif
 
 #pragma mark -
 
@@ -89,7 +100,7 @@ void ConfigManager::loadDefaultConfigFile() {
 	#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
 		GetWindowsDirectory(configFile, MAXPATHLEN);
 		strcat(configFile, "\\" DEFAULT_CONFIG_FILE);
-	#elif defined(__PALM_OS__)
+	#elif defined(PALMOS_MODE)
 		strcpy(configFile,"/PALM/Programs/ScummVM/" DEFAULT_CONFIG_FILE);
 	#elif defined(__PLAYSTATION2__)
 		strcpy(configFile, "mc0:ScummVM/" DEFAULT_CONFIG_FILE);
@@ -101,7 +112,6 @@ void ConfigManager::loadDefaultConfigFile() {
 		strcpy(configFile, DEFAULT_CONFIG_FILE);
 	#endif
 #endif
-
 	loadConfigFile(configFile);
 }
 
diff --git a/common/config-manager.h b/common/config-manager.h
index 71ea453add..df91781e19 100644
--- a/common/config-manager.h
+++ b/common/config-manager.h
@@ -67,11 +67,16 @@ public:
 
 	typedef Map<String, Domain, IgnoreCaseComparator> DomainMap;
 
+#ifndef PALMOS_ARM
 	/** The name of the application domain (normally 'scummvm'). */
 	static const String kApplicationDomain;
 
 	/** The transient (pseudo) domain. */
 	static const String kTransientDomain;
+#else
+	static const char *kApplicationDomain;
+	static const char *kTransientDomain;
+#endif
 
 	void				loadDefaultConfigFile();
 	void				loadConfigFile(const String &filename);