diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-06 10:06:39 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-06 10:06:39 +0300 |
| commit | cacb61b6be78b01a9c62890cc81d059ee46921ac (patch) | |
| tree | 7065a7417d5569d5a5f61104daf09f6a98e842bc /include | |
| parent | aed87f1e0aa20e9e3f525ff303ee766ca6b106b7 (diff) | |
| parent | f089f8d95e569291bdf4329124c34674f02e40fe (diff) | |
| download | mariadb-git-cacb61b6be78b01a9c62890cc81d059ee46921ac.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_time.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/my_time.h b/include/my_time.h index b7b54db5586..9f3e61b944f 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -244,9 +244,12 @@ static inline void my_time_trunc(MYSQL_TIME *ltime, uint decimals) !ltime->hour && !ltime->minute && !ltime->second) ltime->neg= FALSE; } +#ifdef _WIN32 +#define suseconds_t long +#endif static inline void my_timeval_trunc(struct timeval *tv, uint decimals) { - tv->tv_usec-= my_time_fraction_remainder(tv->tv_usec, decimals); + tv->tv_usec-= (suseconds_t) my_time_fraction_remainder(tv->tv_usec, decimals); } |