luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: drop fseeko() pre-fill and check for Windows

Browse Source 
To sync detection code with autotools.

Closes #16041
This commit is contained in:
Viktor Szakats 2025-01-18 00:07:16 +01:00
parent 0ed36150b6
commit 08e2cceaf1
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMake/win32-cache.cmake
View File

@ -161,7 +161,6 @@ set(HAVE_TERMIOS_H 0)
set(HAVE_TERMIO_H 0) set(HAVE_TERMIO_H 0)
set(HAVE_LINUX_TCP_H 0) set(HAVE_LINUX_TCP_H 0)
set(HAVE_FSEEKO 0) # mingw-w64 2.0.0 and newer has it
set(HAVE_SOCKET 1) set(HAVE_SOCKET 1)
set(HAVE_SELECT 1) set(HAVE_SELECT 1)
set(HAVE_STRDUP 1) set(HAVE_STRDUP 1)

2
CMakeLists.txt
View File

@ -1788,6 +1788,7 @@ if(HAVE_FILE_OFFSET_BITS)
endif() endif()
check_type_size("off_t" SIZEOF_OFF_T) check_type_size("off_t" SIZEOF_OFF_T)
if(NOT WIN32)
# fseeko may not exist with _FILE_OFFSET_BITS=64 but can exist with # fseeko may not exist with _FILE_OFFSET_BITS=64 but can exist with
# _FILE_OFFSET_BITS unset or 32 (e.g. Android ARMv7 with NDK 26b and API level < 24) # _FILE_OFFSET_BITS unset or 32 (e.g. Android ARMv7 with NDK 26b and API level < 24)
# so we need to test fseeko after testing for _FILE_OFFSET_BITS # so we need to test fseeko after testing for _FILE_OFFSET_BITS
@ -1796,6 +1797,7 @@ check_symbol_exists("fseeko" "${CURL_INCLUDES};stdio.h" HAVE_FSEEKO)
if(HAVE_FSEEKO) if(HAVE_FSEEKO)
set(HAVE_DECL_FSEEKO 1) set(HAVE_DECL_FSEEKO 1)
endif() endif()
endif()
# Include this header to get the type # Include this header to get the type
cmake_push_check_state() cmake_push_check_state()

2
lib/curl_setup.h
View File

@ -941,7 +941,7 @@ endings either CRLF or LF so 't' is appropriate.
as their argument */ as their argument */
#define STRCONST(x) x,sizeof(x)-1 #define STRCONST(x) x,sizeof(x)-1
/* Some versions of the Android SDK is missing the declaration */ /* Some versions of the Android NDK is missing the declaration */
#if defined(HAVE_GETPWUID_R) && \ #if defined(HAVE_GETPWUID_R) && \
defined(__ANDROID_API__) && (__ANDROID_API__ < 21) defined(__ANDROID_API__) && (__ANDROID_API__ < 21)
struct passwd; struct passwd;