Fix wonky mingw errors in appveyor

This commit is contained in:
Linus Probert 2019-02-24 22:31:32 +01:00
parent 499f015db9
commit c98e6e6d05
1 changed files with 26 additions and 14 deletions

View File

@ -25,32 +25,44 @@
#define SECONDS_PER_MINUTE 60 #define SECONDS_PER_MINUTE 60
#ifdef _MSC_VER #ifdef _MSC_VER
#define m_gmtime gmtime_s #define m_gmtime(time, obj) gmtime_s(obj, time)
#else #else
#define m_gmtime gmtime_r #define m_gmtime gmtime_r
#endif #endif
static time_t
get_last_monday(time_t time, struct tm *tm)
{
// Zero out the hour and minutes to 00:01:00
time -= tm->tm_hour * SECONDS_PER_HOUR;
time -= tm->tm_min * SECONDS_PER_MINUTE;
time -= tm->tm_sec;
time += 60; // Set it to one minute past midnight
// Reverse time back to last monday
unsigned int dayOfWeek = tm->tm_wday;
time -= (dayOfWeek == 0 ? 6 : dayOfWeek - 1) * SECONDS_PER_DAY;
return time;
}
time_t time_t
time_get_weekly_seed(void) time_get_weekly_seed(void)
{ {
time_t now = time(NULL); time_t now = time(NULL);
#ifdef _MINGW32_
struct tm *tm;
tm = gmtime(&now);
time_t lastMonday = get_last_monday(now, tm);
#else
struct tm tm; struct tm tm;
m_gmtime(&now, &tm); m_gmtime(&now, &tm);
time_t lastMonday = get_last_monday(now, &tm);
#endif
// Zero out the hour and minutes to 00:00:01 debug("Weekly seed: %u", lastMonday);
now -= tm.tm_hour * SECONDS_PER_HOUR; return lastMonday;
now -= tm.tm_min * SECONDS_PER_MINUTE;
now -= tm.tm_sec;
now += 60; // Set it to one minute past midnight
// Reverse time back to last monday
unsigned int dayOfWeek = tm.tm_wday;
now -= (dayOfWeek == 0 ? 6 : dayOfWeek - 1) * SECONDS_PER_DAY;
debug("Weekly seed: %u", now);
return now;
} }
// Example: 190225_weekly // Example: 190225_weekly