diff options
| author | Stefan Boberg <[email protected]> | 2021-08-24 18:45:04 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-08-24 18:45:04 +0200 |
| commit | dd75a076f9736fea1c7432255f3383987d9fb7a6 (patch) | |
| tree | 1f286d95b257b16efe5bf8edd00ab2ed143b1a8c /zencore/include | |
| parent | #undef GetObject to avoid problems in CompactBinaryPackage (diff) | |
| download | zen-dd75a076f9736fea1c7432255f3383987d9fb7a6.tar.xz zen-dd75a076f9736fea1c7432255f3383987d9fb7a6.zip | |
Added post/prewindows.h headers to deal with fallout from windows.h #define shenanigans
Diffstat (limited to 'zencore/include')
| -rw-r--r-- | zencore/include/zencore/postwindows.h | 3 | ||||
| -rw-r--r-- | zencore/include/zencore/prewindows.h | 2 | ||||
| -rw-r--r-- | zencore/include/zencore/windows.h | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/zencore/include/zencore/postwindows.h b/zencore/include/zencore/postwindows.h new file mode 100644 index 000000000..35b7db3af --- /dev/null +++ b/zencore/include/zencore/postwindows.h @@ -0,0 +1,3 @@ +// Copyright Epic Games, Inc. All Rights Reserved. + +#undef GetObject diff --git a/zencore/include/zencore/prewindows.h b/zencore/include/zencore/prewindows.h new file mode 100644 index 000000000..f8f3f6f70 --- /dev/null +++ b/zencore/include/zencore/prewindows.h @@ -0,0 +1,2 @@ +// Copyright Epic Games, Inc. All Rights Reserved. + diff --git a/zencore/include/zencore/windows.h b/zencore/include/zencore/windows.h index b80803a31..2b6dc4839 100644 --- a/zencore/include/zencore/windows.h +++ b/zencore/include/zencore/windows.h @@ -2,6 +2,8 @@ #pragma once +#include "prewindows.h" + struct IUnknown; // Workaround for "combaseapi.h(229): error C2187: syntax error: 'identifier' was unexpected here" when using /permissive- #ifndef NOMINMAX # define NOMINMAX // We don't want your min/max macros @@ -9,4 +11,4 @@ struct IUnknown; // Workaround for "combaseapi.h(229): error C2187: syntax erro #define WIN32_LEAN_AND_MEAN #include <windows.h> -#undef GetObject
\ No newline at end of file +#include "postwindows.h" |