mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages 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
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"