Try to fix build errors with macro redefinition

ad-freiburg · Nov 15, 2024 · 9937811 · 9937811
1 parent 1affa8a
commit 9937811
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/util/ConfigManager/ConfigShorthandVisitor.h b/src/util/ConfigManager/ConfigShorthandVisitor.h
@@ -4,7 +4,9 @@
 #pragma once
 
 // ANTLR runtime uses this as a variable name.
+#ifdef EOF
 #undef EOF
+#endif
 #include <antlr4-runtime.h>
 
 #include "util/ConfigManager/generated/ConfigShorthandParser.h"

diff --git a/src/util/Log.h b/src/util/Log.h
@@ -20,6 +20,11 @@
 #define LOGLEVEL INFO
 #endif
 
+// Abseil does also define its own LOG macro, so we need to undefine it here.
+#ifdef LOG
+#undef LOG
+#endif
+
 #define LOG(x)      \
   if (x > LOGLEVEL) \
     ;               \