Merge branch 'windows-tweaks' into develop
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
This commit is contained in:
commit
9927dbb2e4
@ -6,7 +6,8 @@
|
||||
#include <unordered_map>
|
||||
|
||||
#ifdef PLATFORM_WIN
|
||||
// What is this crap?
|
||||
// Defined in Windows header for whatever reason, and leads to nameclash issues with
|
||||
// class enums which have entries of the same name.
|
||||
#undef IN
|
||||
#undef OUT
|
||||
#undef CALLBACK
|
||||
|
Loading…
Reference in New Issue
Block a user