Merge branch 'development' into LTS_development

# Conflicts:
#	src/input/input.cpp
This commit is contained in:
Thulinma 2016-09-22 09:50:09 +02:00
commit 44fd455c8e
9 changed files with 341 additions and 111 deletions

View file

@ -721,6 +721,11 @@ namespace IPC {
return data[172];
}
///\brief Gets PID field
uint32_t statExchange::getPID() {
return *(uint32_t*)(data+173);
}
///\brief Creates a semaphore guard, locks the semaphore on call
semGuard::semGuard(semaphore * thisSemaphore) : mySemaphore(thisSemaphore) {
mySemaphore->wait();