aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMax Horn2011-06-17 12:16:18 -0700
committerMax Horn2011-06-17 12:16:18 -0700
commit158c2252ab4fea7fd9ecea62a2439d82b388df1c (patch)
treebe7e972a8118b92d6cbdc16ce36129a4de3c094f /common
parent825c889e33d2c68dec65e6496c69d5d4a89cba51 (diff)
parentf7c1e7d002c21eeaf0b5c06d3527ede532f5cd51 (diff)
downloadscummvm-rg350-158c2252ab4fea7fd9ecea62a2439d82b388df1c.tar.gz
scummvm-rg350-158c2252ab4fea7fd9ecea62a2439d82b388df1c.tar.bz2
scummvm-rg350-158c2252ab4fea7fd9ecea62a2439d82b388df1c.zip
Merge pull request #42 from fingolfin/no-osystem-defaults
Remove default implementation of OSystem::logMessage
Diffstat (limited to 'common')
-rw-r--r--common/system.cpp19
-rw-r--r--common/system.h2
2 files changed, 1 insertions, 20 deletions
diff --git a/common/system.cpp b/common/system.cpp
index fae7a3ef34..1645a6be10 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -21,11 +21,6 @@
*/
#define FORBIDDEN_SYMBOL_EXCEPTION_exit
-#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
-#define FORBIDDEN_SYMBOL_EXCEPTION_fputs
-#define FORBIDDEN_SYMBOL_EXCEPTION_fflush
-#define FORBIDDEN_SYMBOL_EXCEPTION_stdout
-#define FORBIDDEN_SYMBOL_EXCEPTION_stderr
#include "common/system.h"
#include "common/events.h"
@@ -136,20 +131,6 @@ Common::String OSystem::getDefaultConfigFileName() {
return "scummvm.ini";
}
-void OSystem::logMessage(LogMessageType::Type type, const char *message) {
-#if !defined(__PLAYSTATION2__) && !defined(__DS__)
- FILE *output = 0;
-
- if (type == LogMessageType::kInfo || type == LogMessageType::kDebug)
- output = stdout;
- else
- output = stderr;
-
- fputs(message, output);
- fflush(output);
-#endif
-}
-
Common::String OSystem::getSystemLanguage() const {
return "en_US";
}
diff --git a/common/system.h b/common/system.h
index d26bc593aa..3e740ff0c1 100644
--- a/common/system.h
+++ b/common/system.h
@@ -1101,7 +1101,7 @@ public:
* @param type the type of the message
* @param message the message itself
*/
- virtual void logMessage(LogMessageType::Type type, const char *message);
+ virtual void logMessage(LogMessageType::Type type, const char *message) = 0;
/**
* Open the log file in a way that allows the user to review it,