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.h
+++ b/osal/linux/Mutex.h
@ -1,11 +1,8 @@
 #ifndef OS_LINUX_MUTEX_H_
 #define OS_LINUX_MUTEX_H_

-#include <framework/ipc/MutexIF.h>
-
-extern "C" {
+#include "../../ipc/MutexIF.h"
 #include <pthread.h>
-}


 class Mutex : public MutexIF {