diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2023-11-21 15:44:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-21 15:44:18 +0100 |
commit | c2f8fb301537a5d688d201178985963282b4f9c3 (patch) | |
tree | 6e21f7954af3ef36854f53830519c6b6be8c689f /modules/gdscript/gdscript_tokenizer.h | |
parent | fa259a77cd9ea725f22ccfd52d5c228e10358e1d (diff) | |
parent | fe4850c0d0e8eed3fe851007c667206684aab0fc (diff) | |
download | redot-engine-c2f8fb301537a5d688d201178985963282b4f9c3.tar.gz |
Merge pull request #85039 from RandomShaper/mingwthreads
Use mingw-std-threads in MinGW builds
Diffstat (limited to 'modules/gdscript/gdscript_tokenizer.h')
-rw-r--r-- | modules/gdscript/gdscript_tokenizer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/gdscript/gdscript_tokenizer.h b/modules/gdscript/gdscript_tokenizer.h index 6dd8a98652..a64aaf6820 100644 --- a/modules/gdscript/gdscript_tokenizer.h +++ b/modules/gdscript/gdscript_tokenizer.h @@ -37,6 +37,12 @@ #include "core/templates/vector.h" #include "core/variant/variant.h" +#ifdef MINGW_ENABLED +#undef CONST +#undef IN +#undef VOID +#endif + class GDScriptTokenizer { public: enum CursorPlace { |