Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2016-02-29 13:05:46 +01:00
commit 72c4f9771a

View file

@ -65,7 +65,7 @@ void Util::sleep(int ms) {
long long Util::getNTP() {
struct timespec t;
clock_gettime(CLOCK_REALTIME, &t);
return ((((long long int)t.tv_sec) + 2208988800) << 32) + (t.tv_nsec * 4.2949);
return ((((long long int)t.tv_sec) + 2208988800ll) << 32) + (t.tv_nsec * 4.2949);
}
/// Gets the current time in milliseconds.