feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Add windows definitions to make the code model happy.

Browse Source 
__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 5832c6b584)
This commit is contained in:
Daniel Molkentin
2009-12-10 16:20:34 +01:00
committed by Thorbjørn Lindeijer
parent 8b3bbc0875
commit 3cf861a8ce
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -152,6 +152,7 @@ static const char pp_configuration[] =
// ### add macros for win32 // ### add macros for win32
"#define __cdecl\n" "#define __cdecl\n"
"#define __stdcall\n"
"#define QT_WA(x) x\n" "#define QT_WA(x) x\n"
"#define API\n" "#define API\n"
"#define WINAPI\n" "#define WINAPI\n"

1
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -333,6 +333,7 @@ QByteArray MSVCToolChain::predefinedMacros()
{ {
if (m_predefinedMacros.isEmpty()) { if (m_predefinedMacros.isEmpty()) {
m_predefinedMacros += "#define __MSVCRT__\n" m_predefinedMacros += "#define __MSVCRT__\n"
"#define __w64\n"
"#define __int64 long long\n" "#define __int64 long long\n"
"#define __int32 long\n" "#define __int32 long\n"
"#define __int16 short\n" "#define __int16 short\n"