diff options
| author | Martin Ridgers <[email protected]> | 2021-10-25 22:40:54 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-10-25 22:50:44 +0200 |
| commit | 06a5e7af2d529c117b9046df2563c965cb4b9fbf (patch) | |
| tree | 6f23f2ab38bbb209fdeeb0f9548c224c692816c2 /zencore/include | |
| parent | Define the cut-down Windows defines via zencore.h too (diff) | |
| download | zen-06a5e7af2d529c117b9046df2563c965cb4b9fbf.tar.xz zen-06a5e7af2d529c117b9046df2563c965cb4b9fbf.zip | |
Prevent GetObject from being defined as a macro by Windows.h
Diffstat (limited to 'zencore/include')
| -rw-r--r-- | zencore/include/zencore/windows.h | 3 | ||||
| -rw-r--r-- | zencore/include/zencore/zencore.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/zencore/include/zencore/windows.h b/zencore/include/zencore/windows.h index 417d473e0..4149506e7 100644 --- a/zencore/include/zencore/windows.h +++ b/zencore/include/zencore/windows.h @@ -10,6 +10,9 @@ struct IUnknown; // Workaround for "combaseapi.h(229): error C2187: syntax erro #ifndef NOMINMAX # define NOMINMAX // We don't want your min/max macros #endif +#ifndef NOGDI +# define NOGDI // We don't want your GetObject define +#endif #ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif diff --git a/zencore/include/zencore/zencore.h b/zencore/include/zencore/zencore.h index 345468d55..1092b3a89 100644 --- a/zencore/include/zencore/zencore.h +++ b/zencore/include/zencore/zencore.h @@ -33,6 +33,9 @@ # if !defined(NOMINMAX) # define NOMINMAX // stops Windows.h from defining 'min/max' macros # endif +# if !defined(NOGDI) +# define NOGDI +# endif # if !defined(WIN32_LEAN_AND_MEAN) # define WIN32_LEAN_AND_MEAN // cut-down what Windows.h defines # endif |