maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
fix nameclash with MSVC
This commit is contained in:
Rémi Verschelde 2018-07-18 19:31:44 +02:00 committed by GitHub
parent d1550b4a9b 43ae1c712f
commit b538254b18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

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