diff options
| author | Christian Linke <Christian.Linke@bmw.de> | 2016-02-11 07:28:47 +0100 |
|---|---|---|
| committer | Christian Linke <Christian.Linke@bmw.de> | 2016-02-15 09:00:59 +0100 |
| commit | 5bcd206b9270d9a79e212f91723ea1a08a4d4859 (patch) | |
| tree | 55b0cd4d07fbd7ebfd15d58d02e9cae6ae61b127 /AudioManagerUtilities/src/CAmWatchdog.cpp | |
| parent | 59080ecc2c8840fd85c561adea3f85f5344534a8 (diff) | |
| download | audiomanager-5bcd206b9270d9a79e212f91723ea1a08a4d4859.tar.gz | |
* rework of the build structure, adopt to standard cmake package structure7.4
* check versions when loading the libs
* introduction of the AudioManagerCore
* give control plugin as file or directory
* remove SQLITE
* either find and use gmock or build and install it
* fixed [Bug 411]
* compile flag gnu11 is now used
Signed-off-by: Christian Linke <Christian.Linke@bmw.de>
Signed-off-by: Christian Linke <Christian.Linke@bmw.de>
Diffstat (limited to 'AudioManagerUtilities/src/CAmWatchdog.cpp')
| -rwxr-xr-x | AudioManagerUtilities/src/CAmWatchdog.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/AudioManagerUtilities/src/CAmWatchdog.cpp b/AudioManagerUtilities/src/CAmWatchdog.cpp index db65095..9de2a85 100755 --- a/AudioManagerUtilities/src/CAmWatchdog.cpp +++ b/AudioManagerUtilities/src/CAmWatchdog.cpp @@ -27,12 +27,7 @@ #include <stdexcept> #include "audiomanagerconfig.h" #include "CAmDltWrapper.h" - -#ifdef SYSTEMD_FOUND - #include <systemd/sd-daemon.h> -#else - #include "sd-daemon.h" -#endif +#include <systemd/sd-daemon.h> namespace am { @@ -61,7 +56,7 @@ CAmWatchdog::CAmWatchdog(CAmSocketHandler* CAmSocketHandler) : timeout.tv_sec = (watchdogTimeout / 2) / 1000000; timeout.tv_nsec = ((watchdogTimeout / 2) % 1000000) * 1000; logInfo("CAmWatchdog::CAmWatchdog setting watchdog timeout:", watchdogTimeout, "us. Notification set to:", - timeout.tv_sec, "sec and", timeout.tv_nsec, "ns"); + (int)timeout.tv_sec, "sec and", (int)timeout.tv_nsec, "ns"); //add the timer here if (mpCAmSocketHandler->addTimer(timeout, &TimerCallback, mHandle, NULL)) |