From feba4f9d4630497f4cc8bff7aa9c2fb6a25a8375 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Thu, 21 Mar 2024 08:36:06 +0100 Subject: [PATCH] fixup windows --- application/F3DStarter.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/application/F3DStarter.cxx b/application/F3DStarter.cxx index bcb2da841d..4335459e11 100644 --- a/application/F3DStarter.cxx +++ b/application/F3DStarter.cxx @@ -8,6 +8,10 @@ #define DMON_IMPL #include "dmon.h" +#ifdef WIN32 + // dmon includes Windows.h which defines 'ERROR' and conflicts with log.h + #undef ERROR +#endif #include "engine.h" #include "interactor.h"