From 8b39074078f2f7366aa2589da655a654f3be5f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kleines=20Filmr=C3=B6llchen?= Date: Wed, 2 Feb 2022 21:32:32 +0100 Subject: [PATCH] Userland: Undefine FOR_EACH_TOKEN_TYPE everywhere This was causing some macro redefinition errors after the headers ended up in the same file through some includes. The simple fix is to undefine the macro after use. --- Userland/Libraries/LibCpp/Token.h | 2 ++ Userland/Libraries/LibGUI/GML/Lexer.h | 2 ++ Userland/Libraries/LibGUI/GitCommitLexer.h | 2 ++ Userland/Libraries/LibGUI/INILexer.h | 2 ++ 4 files changed, 8 insertions(+) diff --git a/Userland/Libraries/LibCpp/Token.h b/Userland/Libraries/LibCpp/Token.h index 70b4b3cfe0f..f4de7fbfcfc 100644 --- a/Userland/Libraries/LibCpp/Token.h +++ b/Userland/Libraries/LibCpp/Token.h @@ -135,3 +135,5 @@ private: }; } + +#undef FOR_EACH_TOKEN_TYPE diff --git a/Userland/Libraries/LibGUI/GML/Lexer.h b/Userland/Libraries/LibGUI/GML/Lexer.h index bdaa6d7c9ec..f50c2eb8947 100644 --- a/Userland/Libraries/LibGUI/GML/Lexer.h +++ b/Userland/Libraries/LibGUI/GML/Lexer.h @@ -67,3 +67,5 @@ private: }; } + +#undef FOR_EACH_TOKEN_TYPE diff --git a/Userland/Libraries/LibGUI/GitCommitLexer.h b/Userland/Libraries/LibGUI/GitCommitLexer.h index 52dd40badb2..a9925cdb414 100644 --- a/Userland/Libraries/LibGUI/GitCommitLexer.h +++ b/Userland/Libraries/LibGUI/GitCommitLexer.h @@ -60,3 +60,5 @@ private: }; } + +#undef FOR_EACH_TOKEN_TYPE diff --git a/Userland/Libraries/LibGUI/INILexer.h b/Userland/Libraries/LibGUI/INILexer.h index 4f187f02aaa..4509044fdda 100644 --- a/Userland/Libraries/LibGUI/INILexer.h +++ b/Userland/Libraries/LibGUI/INILexer.h @@ -66,3 +66,5 @@ private: }; } + +#undef FOR_EACH_TOKEN_TYPE