diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index f9bb024e994..5df793bbc9e 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -44,6 +44,7 @@ #endif #ifdef Q_OS_WIN +#define CALLBACK WINAPI #include #include #endif diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 6384aef7d39..b1c05fc4676 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -36,6 +36,7 @@ #include #ifdef Q_OS_WIN +#define CALLBACK WINAPI #include #else #include diff --git a/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp b/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp index 91026268630..7f353b0e227 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp @@ -41,6 +41,7 @@ // for windows progress bar #ifndef __GNUC__ +# define CALLBACK WINAPI # include #endif diff --git a/src/plugins/debugger/registerpostmortemaction.cpp b/src/plugins/debugger/registerpostmortemaction.cpp index 3a7facbaf91..ac9e8c53fbb 100644 --- a/src/plugins/debugger/registerpostmortemaction.cpp +++ b/src/plugins/debugger/registerpostmortemaction.cpp @@ -31,6 +31,7 @@ #include #include +#define CALLBACK WINAPI #include #include #include diff --git a/src/shared/qtcreator_pch.h b/src/shared/qtcreator_pch.h index 3106ca5ba35..4f93238efba 100644 --- a/src/shared/qtcreator_pch.h +++ b/src/shared/qtcreator_pch.h @@ -50,6 +50,9 @@ #undef ERROR #undef ABSOLUTE +// LLVM 12 comes with CALLBACK as a template argument +#undef CALLBACK + #define _POSIX_ #include #undef _POSIX_