From 283dba00c337c1676cca4dc85892f2a4b7390bf1 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Thu, 20 Oct 2022 08:24:09 -0700 Subject: [PATCH] Fix the "None" define with a hammer The X.h definition of None creeps in older Linux distributions in multiple places. Better to just force undefine it because we never need it --- thirdparty/clipper2/Clipper2Lib/include/clipper2/clipper.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/thirdparty/clipper2/Clipper2Lib/include/clipper2/clipper.h b/thirdparty/clipper2/Clipper2Lib/include/clipper2/clipper.h index 33b7bfccaf..4905e37527 100644 --- a/thirdparty/clipper2/Clipper2Lib/include/clipper2/clipper.h +++ b/thirdparty/clipper2/Clipper2Lib/include/clipper2/clipper.h @@ -13,6 +13,11 @@ #include #include +// Remove this define (comes in from X.h on older Linuxes) +#ifdef None +#undef None +#endif + #include "clipper.core.h" #include "clipper.engine.h" #include "clipper.offset.h"