summaryrefslogtreecommitdiffstats
path: root/src/timer.cpp
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-02-22 11:44:27 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-02-22 12:15:13 +0100
commit747d58ad84d230f6cf11ac818bab65019df83611 (patch)
treea7a6f84cac521fd181b8aec490260fda676f08cc /src/timer.cpp
parentcfd941effb1b2183f6d3f693496aadd45762523f (diff)
No more warning about not defined functions
because of wrong header files inclusion. Some variables are now accessible using functions rather than using global variables that can not be accessed through separated files. Also fix timer returning function type. Change-Id: I36138ff671c2537f595235273abaa34783be18e1 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/timer.cpp')
-rw-r--r--src/timer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/timer.cpp b/src/timer.cpp
index b0ccb628..01fd7636 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -17,15 +17,15 @@
#include "timer.hpp"
-inline unsigned long systemTimeMs()
+long long int systemTimeMs()
{
struct timeb t_msec;
- unsigned long int timestamp_msec;
+ long long int timestamp_msec;
if(!::ftime(&t_msec))
{
- timestamp_msec = ((unsigned long int) t_msec.time) * 1000ll +
- (unsigned long int) t_msec.millitm;
+ timestamp_msec = (t_msec.time) * 1000ll +
+ t_msec.millitm;
}
return timestamp_msec;
} \ No newline at end of file