summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2010-07-20 19:07:41 -0500
committerDavid Athay <ko2fan@gmail.com>2010-07-20 19:07:41 -0500
commit47ce39b8d79a62f43213df422d38a58b41f0ed07 (patch)
tree622e57cf3ce23825cec275851d157d66fa6af85b /src
parent97b633896b70e19e00580f7ce6aee7788c4c62ee (diff)
parentd1d730b3e64cd7d0e064b8f3138604df2ad121c4 (diff)
downloadmana-47ce39b8d79a62f43213df422d38a58b41f0ed07.tar.gz
mana-47ce39b8d79a62f43213df422d38a58b41f0ed07.tar.bz2
mana-47ce39b8d79a62f43213df422d38a58b41f0ed07.tar.xz
mana-47ce39b8d79a62f43213df422d38a58b41f0ed07.zip
Merge branch '1.0' of gitorious.org:mana/mana into 1.0
Diffstat (limited to 'src')
-rw-r--r--src/log.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/log.cpp b/src/log.cpp
index ba1610fd..435b2da0 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -30,6 +30,8 @@
#include <windows.h>
#elif __APPLE__
#include <Carbon/Carbon.h>
+#elif __linux__ || __linux
+#include <stdlib.h>
#endif
#include <sys/time.h>
@@ -123,6 +125,10 @@ void Logger::error(const std::string &error_text)
StandardAlert(kAlertStopAlert,
"\pError",
(ConstStr255Param) msg, NULL, NULL);
+#elif defined __linux__ || __linux
+ std::cerr << "Error: " << error_text << std::endl;
+ std::string msg="xmessage \"" + error_text + "\"";
+ system(msg.c_str());
#else
std::cerr << "Error: " << error_text << std::endl;
#endif