aboutsummaryrefslogtreecommitdiff
path: root/common/textconsole.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2011-06-03 01:14:16 -0400
committerMatthew Hoops2011-06-03 01:14:16 -0400
commit224c71e483e09931ba386555ff3b436b9defe63d (patch)
tree8e6178331a7bbd3ee1be318d3fc7a7c7f478468f /common/textconsole.cpp
parentd4c92983920cfe3b25a22d91e12c750e591b917e (diff)
parent547fd1bdcabcba0e741eb31100ba99ff73399d24 (diff)
downloadscummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.gz
scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.bz2
scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.zip
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'common/textconsole.cpp')
-rw-r--r--common/textconsole.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/textconsole.cpp b/common/textconsole.cpp
index 0bd233d206..f2325ac9ad 100644
--- a/common/textconsole.cpp
+++ b/common/textconsole.cpp
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#define FORBIDDEN_SYMBOL_EXCEPTION_exit
+
#include "common/textconsole.h"
#include "common/system.h"
#include "common/str.h"