diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2009-12-10 16:20:34 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2009-12-18 13:57:32 +0100 |
| commit | 3cf861a8cebceb92b6a2e79500d1cd61e694a533 (patch) | |
| tree | b58f26ab8947c4a9abde2fdbcbcea505182d5a71 /src | |
| parent | 8b3bbc08755d606c8668f042d546c4149e9e419b (diff) | |
Add windows definitions to make the code model happy.
__stdcall for all compilers (MSVC and MinGW, possibly others may use it)
__w64 is MSVC only, deprecated there, but still used in some places
Reviewed-By: Roberto Raggi
(cherry picked from commit 5832c6b584cc477db12f8ac843c15ce12cea1cb1)
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/toolchain.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 5cae6bdeaf..189340777a 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -152,6 +152,7 @@ static const char pp_configuration[] = // ### add macros for win32 "#define __cdecl\n" + "#define __stdcall\n" "#define QT_WA(x) x\n" "#define API\n" "#define WINAPI\n" diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index df0f2e405d..585836423a 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -333,6 +333,7 @@ QByteArray MSVCToolChain::predefinedMacros() { if (m_predefinedMacros.isEmpty()) { m_predefinedMacros += "#define __MSVCRT__\n" + "#define __w64\n" "#define __int64 long long\n" "#define __int32 long\n" "#define __int16 short\n" |