Merge branch 'feature/move_gettimeofday_in_clock_gettime' into 'master'

newlib: Move _gettimeofday_r call in clock_gettime

Closes IDFGH-1525

See merge request espressif/esp-idf!5562
pull/3874/head
Angus Gratton 2019-07-29 19:25:11 +08:00
commit e9b77d3a69
1 zmienionych plików z 1 dodań i 1 usunięć

Wyświetl plik

@ -414,10 +414,10 @@ int clock_gettime (clockid_t clock_id, struct timespec *tp)
return -1;
}
struct timeval tv;
_gettimeofday_r(NULL, &tv, NULL);
uint64_t monotonic_time_us = 0;
switch (clock_id) {
case CLOCK_REALTIME:
_gettimeofday_r(NULL, &tv, NULL);
tp->tv_sec = tv.tv_sec;
tp->tv_nsec = tv.tv_usec * 1000L;
break;