diff options
| author | Eugene Sandulenko | 2005-11-27 02:35:57 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-11-27 02:35:57 +0000 |
| commit | edfae828f6a792fe4809ca77a1181a00ed8b9f46 (patch) | |
| tree | 69669f918ebfcb846c9a699a81c1c74804e720d1 /common | |
| parent | e6aba1f7aa00721140809b7b55270c4e171f53e5 (diff) | |
| download | scummvm-rg350-edfae828f6a792fe4809ca77a1181a00ed8b9f46.tar.gz scummvm-rg350-edfae828f6a792fe4809ca77a1181a00ed8b9f46.tar.bz2 scummvm-rg350-edfae828f6a792fe4809ca77a1181a00ed8b9f46.zip | |
Patch #1341626: "New GP32 port"
svn-id: r19710
Diffstat (limited to 'common')
| -rw-r--r-- | common/config-manager.cpp | 4 | ||||
| -rw-r--r-- | common/config-manager.h | 2 | ||||
| -rw-r--r-- | common/str.cpp | 2 | ||||
| -rw-r--r-- | common/str.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 995d9d601a..44152c38a1 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -62,7 +62,7 @@ static bool isValidDomainName(const Common::String &domain) { namespace Common { -#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG)) +#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__)) const String ConfigManager::kApplicationDomain("scummvm"); const String ConfigManager::kTransientDomain("__TRANSIENT"); @@ -514,7 +514,7 @@ bool ConfigManager::hasGameDomain(const String &domain) const { const String &ConfigManager::Domain::get(const String &key) const { Node *node = findNode(_root, key); -#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG)) +#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__)) return node ? node->_value : String::emptyString; #else return node ? node->_value : ConfMan._emptyString; diff --git a/common/config-manager.h b/common/config-manager.h index b3ba3c5caa..746b641b90 100644 --- a/common/config-manager.h +++ b/common/config-manager.h @@ -67,7 +67,7 @@ public: typedef Map<String, Domain, IgnoreCaseComparator> DomainMap; -#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG)) +#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__)) /** The name of the application domain (normally 'scummvm'). */ static const String kApplicationDomain; diff --git a/common/str.cpp b/common/str.cpp index 29a43d1c55..4764eb0da8 100644 --- a/common/str.cpp +++ b/common/str.cpp @@ -25,7 +25,7 @@ namespace Common { -#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG)) +#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__)) const String String::emptyString; #else const char *String::emptyString = ""; diff --git a/common/str.h b/common/str.h index c11414534c..5ca7b6fa02 100644 --- a/common/str.h +++ b/common/str.h @@ -37,7 +37,7 @@ protected: int _capacity; public: -#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG)) +#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__)) static const String emptyString; #else static const char *emptyString; |