diff options
| author | Cristian Adam <[email protected]> | 2021-05-05 10:28:07 +0200 |
|---|---|---|
| committer | Cristian Adam <[email protected]> | 2021-05-19 14:51:59 +0000 |
| commit | de9be2bb9dbb7d186ac599a967fef2089565d73c (patch) | |
| tree | 8f08c87a7054f56cc55214bd410eb7ba129c7db9 /src/libs/utils/fileutils.cpp | |
| parent | 3c45f9f23dd3d9e66768f5c163cea23c65bf2e36 (diff) | |
Only define CALLBACK when PCH is used
The PCH header is undefining CALLBACK after loading Windows headers,
but we need to add it back when using Windows headers that need it.
The new definition needs only to be done when the PCH is used,
otherwise it could lead to re-definition warnings.
Amends 7880950eca95d84b302c36fa2f4a72e6f19ea7d4
Change-Id: Iae57ac4bbbfdd45b5f9b50a2242103bec6eea5bc
Reviewed-by: Alessandro Portale <[email protected]>
Reviewed-by: Christian Stenger <[email protected]>
Reviewed-by: Cristian Adam <[email protected]>
Diffstat (limited to 'src/libs/utils/fileutils.cpp')
| -rw-r--r-- | src/libs/utils/fileutils.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index 2cc227c5729..22969d62a0b 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -44,7 +44,9 @@ #endif #ifdef Q_OS_WIN +#ifdef QTCREATOR_PCH_H #define CALLBACK WINAPI +#endif #include <qt_windows.h> #include <shlobj.h> #endif |