Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers

2022-11-14 14:25:36 +01:00
parent c11af63015 d7e16a67a7
commit b48e0fdc0d
11 changed files with 92 additions and 55 deletions
--- a/src/fsfw_hal/common/gpio/gpioDefinitions.h
+++ b/src/fsfw_hal/common/gpio/gpioDefinitions.h
@ -5,6 +5,14 @@
 #include <string>
 #include <unordered_map>

+#ifdef PLATFORM_WIN
+// 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
+#endif
+
 using gpioId_t = uint16_t;

 namespace gpio {