diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index d8a197b45a3..d2493e2e457 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -208,7 +208,14 @@ const char pp_configuration[] = "#define __finally\n" "#define __inline inline\n" "#define __forceinline inline\n" - "#define __pragma(x)\n"; + "#define __pragma(x)\n" + "#define __w64\n" + "#define __int64 long long\n" + "#define __int32 long\n" + "#define __int16 short\n" + "#define __int8 char\n" + "#define __ptr32\n" + "#define __ptr64\n"; QSet CppModelManager::timeStampModifiedFiles(const QList &documentsToCheck) { diff --git a/src/plugins/projectexplorer/abstractmsvctoolchain.cpp b/src/plugins/projectexplorer/abstractmsvctoolchain.cpp index c66be6cc4b2..c9ecff28a9c 100644 --- a/src/plugins/projectexplorer/abstractmsvctoolchain.cpp +++ b/src/plugins/projectexplorer/abstractmsvctoolchain.cpp @@ -270,23 +270,10 @@ bool AbstractMsvcToolChain::canClone() const } // Function must be thread-safe! -QByteArray AbstractMsvcToolChain::msvcPredefinedMacros(const QStringList cxxflags, - const Utils::Environment& env) const +QByteArray AbstractMsvcToolChain::msvcPredefinedMacros(const QStringList, + const Utils::Environment&) const { - Q_UNUSED(cxxflags); - Q_UNUSED(env); - - static const QByteArray predefinedMacros( - "#define __MSVCRT__\n" - "#define __w64\n" - "#define __int64 long long\n" - "#define __int32 long\n" - "#define __int16 short\n" - "#define __int8 char\n" - "#define __ptr32\n" - "#define __ptr64\n"); - - return predefinedMacros; + return QByteArray(); } bool AbstractMsvcToolChain::generateEnvironmentSettings(const Utils::Environment &env, diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index c350c7c3022..86c3b32c1e4 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -409,7 +409,7 @@ static QByteArray msvcCompilationFile() QByteArray MsvcToolChain::msvcPredefinedMacros(const QStringList cxxflags, const Utils::Environment &env) const { - QByteArray predefinedMacros = AbstractMsvcToolChain::msvcPredefinedMacros(cxxflags, env); + QByteArray predefinedMacros; QStringList toProcess; foreach (const QString &arg, cxxflags) {