diff options
| author | Friedemann Kleint <[email protected]> | 2022-12-20 16:13:43 +0100 |
|---|---|---|
| committer | Friedemann Kleint <[email protected]> | 2022-12-22 17:43:32 +0100 |
| commit | 469ef8995180df65f1906b6451759ff2a1de0937 (patch) | |
| tree | cc773832fa5903024571340d4f26fcc112e47842 /sources/shiboken6/libshiboken/helper.cpp | |
| parent | 0b1361f4d70ef00e3a10a390f6b87b756f012838 (diff) | |
libshiboken: Include windows.h with consistent defines
Otherwise, clashes can occur in CMake UNITY_BUILD (jumbo) builds. Amends
5ef2f78f7d0172683d6ae63314530844c48c548e.
Task-number: PYSIDE-2155
Change-Id: Id0145f687caece83d595756254f8672f9de3a370
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Christian Tismer <[email protected]>
Diffstat (limited to 'sources/shiboken6/libshiboken/helper.cpp')
| -rw-r--r-- | sources/shiboken6/libshiboken/helper.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sources/shiboken6/libshiboken/helper.cpp b/sources/shiboken6/libshiboken/helper.cpp index 378511010..84231f844 100644 --- a/sources/shiboken6/libshiboken/helper.cpp +++ b/sources/shiboken6/libshiboken/helper.cpp @@ -15,13 +15,7 @@ #include <cctype> #ifdef _WIN32 -# ifndef NOMINMAX -# define NOMINMAX -# endif -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -# endif -# include <windows.h> +# include <sbkwindows.h> #else # include <pthread.h> #endif |