curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-16 17:12:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

config-win32: fix SIZEOF_OFF_T for MSVC and old MinGW

Browse Source 
The previously set default value of 8 (64-bit) is only correct for
mingw-w64 and only when we set `_FILE_OFFSET_BITS` to 64 (the default
when building curl). For MSVC, old MinGW and other Windows compilers,
the correct value is 4 (32-bit). Adjust condition accordingly. Also
drop the manual override option.

Regression in 7.86.0 (from 68fa9bf3f5)

Bug: https://github.com/curl/curl/pull/9712#issuecomment-1307330551

Reported-by: Peter Piekarski
Reviewed-by: Jay Satiro

Closes #9872
This commit is contained in:
Viktor Szakats 2022-11-11 20:12:15 +00:00
parent bf12c2bed6
commit 83c4c1a056
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/config-win32.h
View File

@ -331,11 +331,6 @@
/* Define to the size of `curl_off_t', as computed by sizeof. */ /* Define to the size of `curl_off_t', as computed by sizeof. */
#define SIZEOF_CURL_OFF_T 8 #define SIZEOF_CURL_OFF_T 8
/* Define to the size of `off_t', as computed by sizeof. */
#ifndef SIZEOF_OFF_T
#define SIZEOF_OFF_T 8
#endif
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
/* BSD-style lwIP TCP/IP stack SPECIFIC */ /* BSD-style lwIP TCP/IP stack SPECIFIC */
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
@ -577,6 +572,14 @@ Vista
# endif # endif
#endif #endif
/* Define to the size of `off_t', as computed by sizeof. */
#if defined(__MINGW64_VERSION_MAJOR) && \
defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
# define SIZEOF_OFF_T 8
#else
# define SIZEOF_OFF_T 4
#endif
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
/* DNS RESOLVER SPECIALTY */ /* DNS RESOLVER SPECIALTY */
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */