Merge branch 'development' into LTS_development
This commit is contained in:
commit
72c4f9771a
1 changed files with 1 additions and 1 deletions
|
@ -65,7 +65,7 @@ void Util::sleep(int ms) {
|
||||||
long long Util::getNTP() {
|
long long Util::getNTP() {
|
||||||
struct timespec t;
|
struct timespec t;
|
||||||
clock_gettime(CLOCK_REALTIME, &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.
|
/// Gets the current time in milliseconds.
|
||||||
|
|
Loading…
Add table
Reference in a new issue