godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix nameclash with MSVC 

(cherry picked from commit 43ae1c712f)
This commit is contained in:
karroffel 2018-07-18 15:28:49 +02:00 committed by Rémi Verschelde
parent 392d988228
commit f302888a47
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/typedefs.h
View File

@ -93,6 +93,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"