From 43ae1c712fcdbe0159085386391fa1ab67aab1d7 Mon Sep 17 00:00:00 2001 From: karroffel Date: Wed, 18 Jul 2018 15:28:49 +0200 Subject: fix nameclash with MSVC --- core/typedefs.h | 1 + 1 file changed, 1 insertion(+) 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" -- cgit v1.2.3