4c9e4e99c1
Viktor Szakats
2026-01-07
Subject
build: detect and include `inttypes.h` again
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
.github/scripts/cmp-config.pl +0 -1CMake/unix-cache.cmake +1 -0CMake/win32-cache.cmake +3 -0CMakeLists.txt +1 -0lib/config-os400.h +3 -0lib/config-plan9.h +1 -0lib/config-riscos.h +3 -0lib/config-win32.h +5 -0lib/curl_config-cmake.h.in +3 -0lib/curl_setup.h +7 -0
.github/scripts/cmp-config.pl+0 -1
| @@ -48,7 +48,6 @@ my %remove = ( | |
| '#define HAVE_GSSAPI_GSSAPI_GENERIC_H 1' => 1, | |
| '#define HAVE_GSSAPI_GSSAPI_H 1' => 1, | |
| '#define HAVE_GSSAPI_GSSAPI_KRB5_H 1' => 1, | |
| - | '#define HAVE_INTTYPES_H 1' => 1, |
| '#define HAVE_LDAP_H 1' => 1, | |
| '#define HAVE_LDAP_SSL 1' => 1, | |
| '#define HAVE_LIBBROTLIDEC 1' => 1, | |
CMake/unix-cache.cmake+1 -0
| @@ -151,6 +151,7 @@ set(HAVE_IFADDRS_H 1) | |
| set(HAVE_IF_NAMETOINDEX 1) | |
| set(HAVE_INET_NTOP 1) | |
| set(HAVE_INET_PTON 1) | |
| + | set(HAVE_INTTYPES_H 1) |
| set(HAVE_IOCTLSOCKET 0) | |
| set(HAVE_IOCTLSOCKET_CAMEL 0) | |
| set(HAVE_IOCTLSOCKET_CAMEL_FIONBIO 0) | |
CMake/win32-cache.cmake+3 -0
| @@ -31,6 +31,7 @@ if(MINGW) | |
| set(HAVE_DIRENT_H 1) | |
| set(HAVE_FTRUNCATE 1) | |
| set(HAVE_GETTIMEOFDAY 1) | |
| + | set(HAVE_INTTYPES_H 1) |
| set(HAVE_LIBGEN_H 1) | |
| set(HAVE_OPENDIR 1) | |
| set(HAVE_SNPRINTF 1) | |
| @@ -55,8 +56,10 @@ else() | |
| set(HAVE_STDDEF_H 1) # detected by CMake internally in check_type_size() | |
| set(HAVE_STDINT_H 1) # detected by CMake internally in check_type_size() | |
| if(MSVC_VERSION GREATER_EQUAL 1800) | |
| + | set(HAVE_INTTYPES_H 1) |
| set(HAVE_STDBOOL_H 1) | |
| else() | |
| + | set(HAVE_INTTYPES_H 0) |
| set(HAVE_STDBOOL_H 0) | |
| endif() | |
| set(HAVE_BOOL_T "${HAVE_STDBOOL_H}") | |
CMakeLists.txt+1 -0
| @@ -1461,6 +1461,7 @@ check_include_file_concat_curl("arpa/inet.h" HAVE_ARPA_INET_H) | |
| check_include_file("dirent.h" HAVE_DIRENT_H) | |
| check_include_file("fcntl.h" HAVE_FCNTL_H) | |
| check_include_file_concat_curl("ifaddrs.h" HAVE_IFADDRS_H) | |
| + | check_include_file("inttypes.h" HAVE_INTTYPES_H) |
| check_include_file("io.h" HAVE_IO_H) | |
| check_include_file_concat_curl("libgen.h" HAVE_LIBGEN_H) | |
| check_include_file("linux/tcp.h" HAVE_LINUX_TCP_H) | |
lib/config-os400.h+3 -0
| @@ -96,6 +96,9 @@ | |
| /* Define if you have the `timeval' struct. */ | |
| #define HAVE_STRUCT_TIMEVAL | |
| + | /* Define if you have the <inttypes.h> header file. */ |
| + | #define HAVE_INTTYPES_H |
| + | |
| /* Define if you have the <io.h> header file. */ | |
| #undef HAVE_IO_H | |
lib/config-plan9.h+1 -0
| @@ -83,6 +83,7 @@ | |
| #define HAVE_GMTIME_R 1 | |
| #define HAVE_INET_NTOP 1 | |
| #define HAVE_INET_PTON 1 | |
| + | #define HAVE_INTTYPES_H 1 |
| #define HAVE_LIBGEN_H 1 | |
| #define HAVE_LIBZ 1 | |
| #define HAVE_LOCALE_H 1 | |
lib/config-riscos.h+3 -0
| @@ -96,6 +96,9 @@ | |
| /* Define if you have the `timeval' struct. */ | |
| #define HAVE_STRUCT_TIMEVAL | |
| + | /* Define if you have the <inttypes.h> header file. */ |
| + | #define HAVE_INTTYPES_H |
| + | |
| /* Define if you have the <io.h> header file. */ | |
| #undef HAVE_IO_H | |
lib/config-win32.h+5 -0
| @@ -82,6 +82,11 @@ | |
| /* Define if you have the <fcntl.h> header file. */ | |
| #define HAVE_FCNTL_H 1 | |
| + | /* Define to 1 if you have the <inttypes.h> header file. */ |
| + | #if (defined(_MSC_VER) && (_MSC_VER >= 1800)) || defined(__MINGW32__) |
| + | #define HAVE_INTTYPES_H 1 |
| + | #endif |
| + | |
| /* Define if you have the <io.h> header file. */ | |
| #define HAVE_IO_H 1 | |
lib/curl_config-cmake.h.in+3 -0
| @@ -336,6 +336,9 @@ | |
| /* Define to 1 if symbol `sa_family_t' exists */ | |
| #cmakedefine HAVE_SA_FAMILY_T 1 | |
| + | /* Define to 1 if you have the <inttypes.h> header file. */ |
| + | #cmakedefine HAVE_INTTYPES_H 1 |
| + | |
| /* Define to 1 if you have the ioctlsocket function. */ | |
| #cmakedefine HAVE_IOCTLSOCKET 1 | |
lib/curl_setup.h+7 -0
| @@ -464,6 +464,13 @@ | |
| #include <limits.h> | |
| + | #ifdef HAVE_INTTYPES_H |
| + | #include <inttypes.h> |
| + | #else |
| + | #define PRIu32 "u" |
| + | #define PRIx32 "x" |
| + | #endif |
| + | |
| #ifdef _WIN32 | |
| # ifdef HAVE_IO_H | |
| # include <io.h> | |