Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements

2020-08-19 17:30:08 +02:00
parent 20f7217501 49d4b6ebc7
commit 1b8f134029
386 changed files with 3147 additions and 1554 deletions
--- a/osal/linux/Mutex.cpp
+++ b/osal/linux/Mutex.cpp
@ -1,6 +1,6 @@
-#include <framework/osal/linux/Mutex.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
-#include <framework/timemanager/Clock.h>
+#include "Mutex.h"
+#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "../../timemanager/Clock.h"

 uint8_t Mutex::count = 0;