Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-02 22:51:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove WinAPI #undef hacks needed for mingw-std-threads

Browse source 
Instead, we rename the conflicting symbols.
This commit is contained in:
Rémi Verschelde 2025-04-29 12:00:50 +02:00
parent ce94b26de7
commit c019b76523
No known key found for this signature in database
GPG key ID: C3336907360768E1
15 changed files with 46 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/gdscript/gdscript_tokenizer.cpp
View file

@ -107,11 +107,11 @@ static const char *token_names[] = {
"breakpoint", // BREAKPOINT,
"class", // CLASS,
"class_name", // CLASS_NAME,
"const", // CONST,
"const", // TK_CONST,
"enum", // ENUM,
"extends", // EXTENDS,
"func", // FUNC,
"in", // IN,
"in", // TK_IN,
"is", // IS,
"namespace", // NAMESPACE
"preload", // PRELOAD,
@ -121,7 +121,7 @@ static const char *token_names[] = {
"super", // SUPER,
"trait", // TRAIT,
"var", // VAR,
"void", // VOID,
"void", // TK_VOID,
"yield", // YIELD,
// Punctuation
"[", // BRACKET_OPEN,
@ -221,7 +221,7 @@ bool GDScriptTokenizer::Token::is_node_name() const {
case BREAKPOINT:
case CLASS_NAME:
case CLASS:
case CONST:
case TK_CONST:
case CONST_PI:
case CONST_INF:
case CONST_NAN:
@ -234,7 +234,7 @@ bool GDScriptTokenizer::Token::is_node_name() const {
case FOR:
case FUNC:
case IF:
case IN:
case TK_IN:
case IS:
case MATCH:
case NAMESPACE:
@ -250,7 +250,7 @@ bool GDScriptTokenizer::Token::is_node_name() const {
case TRAIT:
case UNDERSCORE:
case VAR:
case VOID:
case TK_VOID:
case WHILE:
case WHEN:
case YIELD:
@ -505,7 +505,7 @@ GDScriptTokenizer::Token GDScriptTokenizerText::annotation() {
KEYWORD_GROUP('c') \
KEYWORD("class", Token::CLASS) \
KEYWORD("class_name", Token::CLASS_NAME) \
KEYWORD("const", Token::CONST) \
KEYWORD("const", Token::TK_CONST) \
KEYWORD("continue", Token::CONTINUE) \
KEYWORD_GROUP('e') \
KEYWORD("elif", Token::ELIF) \
@ -517,7 +517,7 @@ GDScriptTokenizer::Token GDScriptTokenizerText::annotation() {
KEYWORD("func", Token::FUNC) \
KEYWORD_GROUP('i') \
KEYWORD("if", Token::IF) \
KEYWORD("in", Token::IN) \
KEYWORD("in", Token::TK_IN) \
KEYWORD("is", Token::IS) \
KEYWORD_GROUP('m') \
KEYWORD("match", Token::MATCH) \
@ -540,7 +540,7 @@ GDScriptTokenizer::Token GDScriptTokenizerText::annotation() {
KEYWORD("trait", Token::TRAIT) \
KEYWORD_GROUP('v') \
KEYWORD("var", Token::VAR) \
KEYWORD("void", Token::VOID) \
KEYWORD("void", Token::TK_VOID) \
KEYWORD_GROUP('w') \
KEYWORD("while", Token::WHILE) \
KEYWORD("when", Token::WHEN) \