From e3ab64e5bcf535d9e2b326a4834558f0ff86df40 Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Sat, 17 Dec 2016 17:23:28 +0100
Subject: [PATCH] Don't error out when code is compiled by "Intellisense".

---
 include/MUtils/Global.h | 2 +-
 src/Startup.cpp         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/MUtils/Global.h b/include/MUtils/Global.h
index 16f2654..57f6a8c 100644
--- a/include/MUtils/Global.h
+++ b/include/MUtils/Global.h
@@ -62,7 +62,7 @@ class QProcess;
 #endif
 
 //Check CPU options
-#if defined(_MSC_VER) && (!defined(_M_X64)) && defined(_M_IX86_FP)
+#if defined(_MSC_VER) && (!defined(__INTELLISENSE__)) && (!defined(_M_X64)) && defined(_M_IX86_FP)
 	#if (_M_IX86_FP != 0)
 		#error We should not enabled SSE or SSE2 in release builds!
 	#endif
diff --git a/src/Startup.cpp b/src/Startup.cpp
index 6bbd438..faecafc 100644
--- a/src/Startup.cpp
+++ b/src/Startup.cpp
@@ -96,7 +96,7 @@ namespace MUtils
 // MESSAGE HANDLER
 ///////////////////////////////////////////////////////////////////////////////
 
-static void qt_message_handler(QtMsgType type, const char *msg)
+static void qt_message_handler(QtMsgType type, const char *const msg)
 {
 	if((!msg) || (!(msg[0])))
 	{