From ffcf1df72849711b23ff1d184df69f01826edba9 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 22 Jun 2012 02:24:53 +0300
Subject: Fix compilation warnings in windows builds.

---
 src/logger.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/logger.cpp')

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.\"";
-- 
cgit v1.2.3-60-g2f50