diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-07-18 19:31:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 19:31:44 +0200 |
| commit | b538254b1816668938aa63116accc147c97a0eb0 (patch) | |
| tree | 86a4402234029e8dbbd08d532d65d59b07b00d81 | |
| parent | d1550b4a9ba5d416d294a3aeaaf3d4b81559915f (diff) | |
| parent | 43ae1c712fcdbe0159085386391fa1ab67aab1d7 (diff) | |
Merge pull request #20243 from karroffel/object-windows-doof
fix nameclash with MSVC
| -rw-r--r-- | core/typedefs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/typedefs.h b/core/typedefs.h index 4f3c260c2c..71771ea4e6 100644 --- a/core/typedefs.h +++ b/core/typedefs.h @@ -97,6 +97,7 @@ T *_nullptr() { #undef CLAMP // override standard definition #undef Error #undef OK +#undef CONNECT_DEFERRED // override from Windows SDK, clashes with Object enum #endif #include "int_types.h" |