From f302888a478bc0ccfb11c6c14accd9594149693a Mon Sep 17 00:00:00 2001 From: karroffel Date: Wed, 18 Jul 2018 15:28:49 +0200 Subject: [PATCH] fix nameclash with MSVC (cherry picked from commit 43ae1c712fcdbe0159085386391fa1ab67aab1d7) --- core/typedefs.h | 1 + 1 file changed, 1 insertion(+) diff --git a/core/typedefs.h b/core/typedefs.h index 37186cab4d7..f96fc40cea6 100644 --- a/core/typedefs.h +++ b/core/typedefs.h @@ -93,6 +93,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"