summaryrefslogtreecommitdiff
path: root/src/logger.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-06-22 02:24:53 +0300
committerAndrei Karas <akaras@inbox.ru>2012-06-22 12:39:21 +0300
commitffcf1df72849711b23ff1d184df69f01826edba9 (patch)
tree51028276f4fc3d928f107b0ff4a68ed1789e4eb8 /src/logger.cpp
parent319d525f993b0b95205df1cd431985ce575c4049 (diff)
downloadmv-ffcf1df72849711b23ff1d184df69f01826edba9.tar.gz
mv-ffcf1df72849711b23ff1d184df69f01826edba9.tar.bz2
mv-ffcf1df72849711b23ff1d184df69f01826edba9.tar.xz
mv-ffcf1df72849711b23ff1d184df69f01826edba9.zip
Fix compilation warnings in windows builds.
Diffstat (limited to 'src/logger.cpp')
-rw-r--r--src/logger.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/logger.cpp b/src/logger.cpp
index 63af7ae64..91f746ef3 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -33,7 +33,7 @@
#include <windows.h>
#elif defined __APPLE__
#include <Carbon/Carbon.h>
-#elif __linux__ || __linux
+#elif defined(__linux__) || defined(__linux)
#include <stdlib.h>
#endif
@@ -205,7 +205,7 @@ void Logger::safeError(const std::string &error_text)
// StandardAlert(kAlertStopAlert,
// (const unsigned char*)"\pError",
// (ConstStr255Param) msg, nullptr, nullptr);
-#elif defined __linux__ || __linux
+#elif defined(__linux__) || defined(__linux)
std::cerr << "Error: " << error_text << std::endl;
std::string msg = "xmessage \"" + error_text + "\"";
if (system(msg.c_str()) == -1)
@@ -232,7 +232,7 @@ void Logger::error(const std::string &error_text)
// StandardAlert(kAlertStopAlert,
// (const unsigned char*)"\pError",
// (ConstStr255Param) msg, nullptr, nullptr);
-#elif defined __linux__ || __linux
+#elif defined(__linux__) || defined(_linux)
std::cerr << "Error: " << error_text << std::endl;
std::string msg = "xmessage \"Error happend. "
"Please see log file for more information.\"";