summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-10-22 15:41:04 (GMT)
committerBrad King <brad.king@kitware.com>2018-10-22 16:02:38 (GMT)
commit3dc484e5311836e5fb741605075c188e130334bf (patch)
treebac9d6a148d20a4d0ddac621ac4366bae4f17867
parentfd02538974dd952a8639d371c2c0067d30d5469a (diff)
downloadCMake-3dc484e5311836e5fb741605075c188e130334bf.zip
CMake-3dc484e5311836e5fb741605075c188e130334bf.tar.gz
CMake-3dc484e5311836e5fb741605075c188e130334bf.tar.bz2
curl: add missing type sizes for 'long long' and '__int64'
When generating `curl_config.h`, add size information for `long long` and `__int64` types. These are needed as candidates for defining the `ssize_t` type because on MSVC, `long` is not the same size as `size_t`. This problem did not affect upstream curl because it computes the `ssize_t` type in CMake code where all sizes are available. CMake's port computes it in preprocessor logic because universal binaries on macOS do not know type sizes until compile time. Fixes: #18477
-rw-r--r--Utilities/cmcurl/lib/curl_config.h.cmake6
1 files changed, 6 insertions, 0 deletions
diff --git a/Utilities/cmcurl/lib/curl_config.h.cmake b/Utilities/cmcurl/lib/curl_config.h.cmake
index 24d1ca0..75f30cb 100644
--- a/Utilities/cmcurl/lib/curl_config.h.cmake
+++ b/Utilities/cmcurl/lib/curl_config.h.cmake
@@ -876,6 +876,12 @@
/* The size of `long', as computed by sizeof. */
@SIZEOF_LONG_CODE@
+/* The size of `long long', as computed by sizeof. */
+@SIZEOF_LONG_LONG_CODE@
+
+/* The size of `__int64', as computed by sizeof. */
+@SIZEOF___INT64_CODE@
+
/* The size of `off_t', as computed by sizeof. */
@SIZEOF_OFF_T_CODE@