aboutsummaryrefslogtreecommitdiff
path: root/common/config-manager.h
diff options
context:
space:
mode:
authorChris Apers2005-09-03 16:08:27 +0000
committerChris Apers2005-09-03 16:08:27 +0000
commit09b0f765d4a3b4d726d440182fb4e7fdcb5d805f (patch)
tree9f22f192e174d905814f8806595e73a41306272c /common/config-manager.h
parentf7fb3bf7a8cb0dd5c4c892d1c911e3a1fe9996fa (diff)
downloadscummvm-rg350-09b0f765d4a3b4d726d440182fb4e7fdcb5d805f.tar.gz
scummvm-rg350-09b0f765d4a3b4d726d440182fb4e7fdcb5d805f.tar.bz2
scummvm-rg350-09b0f765d4a3b4d726d440182fb4e7fdcb5d805f.zip
Change PalmOS ident and fix ARM bug using global initializers
svn-id: r18744
Diffstat (limited to 'common/config-manager.h')
-rw-r--r--common/config-manager.h5
1 files changed, 5 insertions, 0 deletions
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);