From 3a679ea1739852b171594936cd6899d1bdacbeca Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Tue, 14 Mar 2017 10:44:13 +0100
Subject: [PATCH] ProjectExplorer: Sort known predefined macros for MSVC

Change-Id: Ife28880b06078e2cd0e39a44ce4ca0ca3546b935
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/projectexplorer/msvctoolchain.cpp | 65 ++++++++++++++-----
 1 file changed, 49 insertions(+), 16 deletions(-)

diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 1c6328ad46a..ad8bd0b507d 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -260,22 +260,55 @@ static QString generateDisplayName(const QString &name,
 
 static QByteArray msvcCompilationFile()
 {
-    static const char* macros[] = {"_ATL_VER", "_CHAR_UNSIGNED", "__CLR_VER",
-                                   "__cplusplus_cli", "__COUNTER__", "__cplusplus",
-                                   "_CPPLIB_VER", "_CPPRTTI", "_CPPUNWIND",
-                                   "_DEBUG", "_DLL", "__FUNCDNAME__",
-                                   "__FUNCSIG__", "__FUNCTION__", "_INTEGRAL_MAX_BITS",
-                                   "_M_ALPHA", "_M_AAMD64", "_M_CEE", "_M_CEE_PURE",
-                                   "_M_CEE_SAFE", "_M_IX86", "_M_IA64",
-                                   "_M_IX86_FP", "_M_MPPC", "_M_MRX000",
-                                   "_M_PPC", "_M_X64", "_MANAGED",
-                                   "_MFC_VER", "_MSC_BUILD", "_MSC_EXTENSIONS",
-                                   "_MSC_FULL_VER", "_MSC_VER", "__MSVC_RUNTIME_CHECKS",
-                                   "_MT", "_NATIVE_WCHAR_T_DEFINED", "_OPENMP",
-                                   "_VC_NODEFAULTLIB", "_WCHAR_T_DEFINED", "_WIN32",
-                                   "_WIN32_WCE", "_WIN64", "_Wp64",
-                                   "__DATE__", "__TIME__", "__TIMESTAMP__",
-                                   0};
+    static const char* macros[] = {
+        "_ATL_VER",
+        "_CHAR_UNSIGNED",
+        "__CLR_VER",
+        "__COUNTER__",
+        "__cplusplus",
+        "__cplusplus_cli",
+        "_CPPLIB_VER",
+        "_CPPRTTI",
+        "_CPPUNWIND",
+        "__DATE__",
+        "_DEBUG",
+        "_DLL",
+        "__FUNCDNAME__",
+        "__FUNCSIG__",
+        "__FUNCTION__",
+        "_INTEGRAL_MAX_BITS",
+        "_M_AAMD64",
+        "_M_ALPHA",
+        "_MANAGED",
+        "_M_CEE",
+        "_M_CEE_PURE",
+        "_M_CEE_SAFE",
+        "_MFC_VER",
+        "_M_IA64",
+        "_M_IX86",
+        "_M_IX86_FP",
+        "_M_MPPC",
+        "_M_MRX000",
+        "_M_PPC",
+        "_MSC_BUILD",
+        "_MSC_EXTENSIONS",
+        "_MSC_FULL_VER",
+        "_MSC_VER",
+        "__MSVC_RUNTIME_CHECKS",
+        "_MT",
+        "_M_X64",
+        "_NATIVE_WCHAR_T_DEFINED",
+        "_OPENMP",
+        "__TIME__",
+        "__TIMESTAMP__",
+        "_VC_NODEFAULTLIB",
+        "_WCHAR_T_DEFINED",
+        "_WIN32",
+        "_WIN32_WCE",
+        "_WIN64",
+        "_Wp64",
+        0
+    };
     QByteArray file = "#define __PPOUT__(x) V##x=x\n\n";
     for (int i = 0; macros[i] != 0; ++i) {
         const QByteArray macro(macros[i]);