diff options
| author | Viktor Szakats <commit@vsz.me> | 2021-02-21 02:00:36 +0000 |
|---|---|---|
| committer | Viktor Szakats <commit@vsz.me> | 2021-02-21 02:00:36 +0000 |
| commit | 6b0f217c6597484ae82382cdbd85788e89263a5b (patch) | |
| tree | 85bbd4818f929c8746de2c76e8a021f2d2314445 | |
| parent | 3d954e4e2638fc29a952ebaf1ef235fa2e98ee61 (diff) | |
| download | curl-6b0f217c6597484ae82382cdbd85788e89263a5b.tar.gz | |
time: enable 64-bit time_t in supported mingw environments
(Unless 32-bit `time_t` is selected manually via the `_USE_32BIT_TIME_T`
mingw macro.)
Previously, 64-bit `time_t` was enabled on VS2005 and newer only, and
32-bit `time_t` was used on all other Windows builds.
Assisted-by: Jay Satiro
Closes #6636
| -rw-r--r-- | lib/config-win32.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/config-win32.h b/lib/config-win32.h index e3095576f..3f8b78a2b 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -502,9 +502,14 @@ #define _CRT_NONSTDC_NO_DEPRECATE 1 #endif -/* VS2005 and later default size for time_t is 64-bit, unless - _USE_32BIT_TIME_T has been defined to get a 32-bit time_t. */ -#if defined(_MSC_VER) && (_MSC_VER >= 1400) +/* mingw-w64, mingw using >= MSVCR80, and visual studio >= 2005 (MSVCR80) + all default to 64-bit time_t unless _USE_32BIT_TIME_T is defined */ +#ifdef __MINGW32__ +# include <_mingw.h> +#endif +#if defined(__MINGW64_VERSION_MAJOR) || \ + (defined(__MINGW32__) && (__MSVCRT_VERSION__ >= 0x0800)) || \ + (defined(_MSC_VER) && (_MSC_VER >= 1400)) # ifndef _USE_32BIT_TIME_T # define SIZEOF_TIME_T 8 # else |