Merge branch 'Daedaluz-fixes' into fixes

fixes
Roger A. Light 3 years ago
commit a991a8373f

@ -61,8 +61,11 @@ int mosquitto_lib_init(void)
srand((unsigned int)GetTickCount64()); srand((unsigned int)GetTickCount64());
#elif _POSIX_TIMERS>0 && defined(_POSIX_MONOTONIC_CLOCK) #elif _POSIX_TIMERS>0 && defined(_POSIX_MONOTONIC_CLOCK)
struct timespec tp; struct timespec tp;
#ifdef CLOCK_BOOTTIME
clock_gettime(CLOCK_BOOTTIME, &tp);
#else
clock_gettime(CLOCK_MONOTONIC, &tp); clock_gettime(CLOCK_MONOTONIC, &tp);
#endif
srand((unsigned int)tp.tv_nsec); srand((unsigned int)tp.tv_nsec);
#elif defined(__APPLE__) #elif defined(__APPLE__)
uint64_t ticks; uint64_t ticks;

@ -43,7 +43,11 @@ time_t mosquitto_time(void)
#elif _POSIX_TIMERS>0 && defined(_POSIX_MONOTONIC_CLOCK) #elif _POSIX_TIMERS>0 && defined(_POSIX_MONOTONIC_CLOCK)
struct timespec tp; struct timespec tp;
#ifdef CLOCK_BOOTTIME
clock_gettime(CLOCK_BOOTTIME, &tp);
#else
clock_gettime(CLOCK_MONOTONIC, &tp); clock_gettime(CLOCK_MONOTONIC, &tp);
#endif
return tp.tv_sec; return tp.tv_sec;
#elif defined(__APPLE__) #elif defined(__APPLE__)
static mach_timebase_info_data_t tb; static mach_timebase_info_data_t tb;

Loading…
Cancel
Save