diff options
| author | Viktor Szakats <commit@vsz.me> | 2023-03-13 10:46:38 +0000 |
|---|---|---|
| committer | Viktor Szakats <commit@vsz.me> | 2023-03-13 10:47:21 +0000 |
| commit | db073c9d88b982dd89a73aac3a34b282b8a545fa (patch) | |
| tree | fe1986c86fa4f5dea0ac70c8e35c8653384bee77 /CMake | |
| parent | 8f7d87cbf32e4a0b099dfea5017c6e09a97f58a2 (diff) | |
| download | curl-db073c9d88b982dd89a73aac3a34b282b8a545fa.tar.gz | |
build: fix stdint/inttypes detection with non-autotools
Fix `stdint.h` and `inttypes.h` detection with non-autotools builds on
Windows. (autotools already auto-detected them accurately.)
`lib/config-win32.h` builds (e.g. `Makefile.mk`):
- set `HAVE_STDINT_H` where supported.
- set `HAVE_INTTYPES_H` for MinGW.
CMake:
- auto-detect them on Windows. (They were both force-disabled.)
- delete unused `CURL_PULL_STDINT_H`.
- delete unused `CURL_PULL_INTTYPES_H`.
- stop detecting `HAVE_STDINT_H` twice.
Present since the initial CMake commit: 4c5307b45655ba75ab066564afdc0c111a8b9291
curl doesn't use these C99 headers, we need them now to workaround
broken wolfSSL builds. Ref: #10739
Once that clears up, we can delete these detections and macros (unless
we want to keep them for future us.)
Reviewed-by: Daniel Stenberg
Closes #10745
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/Platforms/WindowsCache.cmake | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/CMake/Platforms/WindowsCache.cmake b/CMake/Platforms/WindowsCache.cmake index cef31b55f..37712377e 100644 --- a/CMake/Platforms/WindowsCache.cmake +++ b/CMake/Platforms/WindowsCache.cmake @@ -29,7 +29,6 @@ if(NOT UNIX) set(HAVE_ARPA_INET_H 0) set(HAVE_FCNTL_H 1) - set(HAVE_INTTYPES_H 0) set(HAVE_IO_H 1) set(HAVE_NETDB_H 0) set(HAVE_NETINET_IN_H 0) @@ -37,7 +36,6 @@ if(NOT UNIX) set(HAVE_PWD_H 0) set(HAVE_SETJMP_H 1) set(HAVE_SIGNAL_H 1) - set(HAVE_STDINT_H 0) set(HAVE_STDLIB_H 1) set(HAVE_STRINGS_H 0) set(HAVE_STRING_H 1) |