From dfa900e4e3928f3a997202abc1b11da2ddad6b97 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Sun, 10 Nov 2013 20:58:57 +0400
Subject: [PATCH] =?UTF-8?q?OS=20X:=20Fixed=20=E2=80=9Cmacro=20redefined?=
 =?UTF-8?q?=E2=80=9D=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/launcher/graphicspage.cpp | 6 ++++--
 apps/launcher/main.cpp         | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index 52fa192d5..516c3d823 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -4,10 +4,12 @@
 #include <QMessageBox>
 #include <QDir>
 
-#ifdef __APPLE__
+#ifdef MAC_OS_X_VERSION_MIN_REQUIRED
+#undef MAC_OS_X_VERSION_MIN_REQUIRED
 // We need to do this because of Qt: https://bugreports.qt-project.org/browse/QTBUG-22154
 #define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
-#endif
+#endif // MAC_OS_X_VERSION_MIN_REQUIRED
+
 #include <SDL.h>
 
 #include <cstdlib>
diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp
index 0b5e62a66..9f89f2810 100644
--- a/apps/launcher/main.cpp
+++ b/apps/launcher/main.cpp
@@ -3,10 +3,12 @@
 #include <QDir>
 #include <QDebug>
 
-#ifdef __APPLE__
+#ifdef MAC_OS_X_VERSION_MIN_REQUIRED
+#undef MAC_OS_X_VERSION_MIN_REQUIRED
 // We need to do this because of Qt: https://bugreports.qt-project.org/browse/QTBUG-22154
 #define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
-#endif
+#endif // MAC_OS_X_VERSION_MIN_REQUIRED
+
 #include <SDL.h>
 
 #include "maindialog.hpp"