Home Explore Help
Sign In
Godot
/
godot
mirror of https://github.com/godotengine/godot.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #20243 from karroffel/object-windows-doof

fix nameclash with MSVC
Rémi Verschelde 7 years ago
parent
d1550b4a9b 43ae1c712f
commit
b538254b18
1 changed files with 1 additions and 0 deletions
Unified View Show Diff Stats
  1. 1 0
      core/typedefs.h

+ 1 - 0
core/typedefs.h
View File 

@@ -97,6 +97,7 @@ T *_nullptr() {
 
 #undef CLAMP // override standard definition
 
 #undef CLAMP // override standard definition
 
 #undef Error
 
 #undef Error
 
 #undef OK
 
 #undef OK
 
+#undef CONNECT_DEFERRED // override from Windows SDK, clashes with Object enum
 
 #endif
 
 #endif
 
 
 
 #include "int_types.h"
 
 #include "int_types.h"