From 4f265a52a28429315509f296f257aeab56e80fde Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Fri, 28 Oct 2022 21:30:59 -0700 Subject: [PATCH] Undefine None for X11 after Clipper2 update --- .../clipper2/Clipper2Lib/include/clipper2/clipper.engine.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/thirdparty/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h b/thirdparty/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h index 2b0c79fdb2..33e4aced2b 100644 --- a/thirdparty/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h +++ b/thirdparty/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h @@ -22,6 +22,10 @@ constexpr auto CLIPPER2_VERSION = "1.2.1"; #include "clipper.core.h" +#ifdef None +#undef None +#endif + namespace Clipper2Lib { struct Scanline;