eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

mueller/master #37

Closed
muellerr wants to merge 126 commits from mueller/master into eive/develop
pull from: mueller/master
merge into: eive:eive/develop
Conversation 0 Commits 126 Files Changed 42 +2270 -8398
235 changed files with 2270 additions and 8398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 98b58200da - Show all commits

1
tests/src/fsfw_tests/internal/osal/IntTestMutex.cpp
View File

@@ -39,7 +39,6 @@ void testmutex::testMutex() {
unitt::put_error(id); unitt::put_error(id);
} }
// TODO: we should pass a define like FSFW_OSAL_HOST to the build.
#if !defined PLATFORM_WIN && !defined PLATFORM_UNIX #if !defined PLATFORM_WIN && !defined PLATFORM_UNIX
result = mutex->unlockMutex(); result = mutex->unlockMutex();
if(result != MutexIF::CURR_THREAD_DOES_NOT_OWN_MUTEX) { if(result != MutexIF::CURR_THREAD_DOES_NOT_OWN_MUTEX) {