You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-04 12:00:25 +00:00
Remove WinAPI #undef hacks needed for mingw-std-threads
Instead, we rename the conflicting symbols.
This commit is contained in:
@@ -35,12 +35,6 @@
|
||||
#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 {
|
||||
@@ -117,11 +111,11 @@ public:
|
||||
BREAKPOINT,
|
||||
CLASS,
|
||||
CLASS_NAME,
|
||||
CONST,
|
||||
TK_CONST, // Conflict with WinAPI.
|
||||
ENUM,
|
||||
EXTENDS,
|
||||
FUNC,
|
||||
IN,
|
||||
TK_IN, // Conflict with WinAPI.
|
||||
IS,
|
||||
NAMESPACE,
|
||||
PRELOAD,
|
||||
@@ -131,7 +125,7 @@ public:
|
||||
SUPER,
|
||||
TRAIT,
|
||||
VAR,
|
||||
VOID,
|
||||
TK_VOID, // Conflict with WinAPI.
|
||||
YIELD,
|
||||
// Punctuation
|
||||
BRACKET_OPEN,
|
||||
|
||||
Reference in New Issue
Block a user