summaryrefslogtreecommitdiffstats
path: root/Source/cmFileCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-05-24 14:09:28 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-05-24 14:09:35 (GMT)
commit7c3169417d2e7ef6dde0a145d9969a1db1470a55 (patch)
tree1402044a109d18f30bed250648bf82c092c00f63 /Source/cmFileCommand.cxx
parent5ceed2bb28ae3fe8dc4f23c5ea9314c61589e295 (diff)
parente243b379ca2b684787dc251b6fc251817c721f68 (diff)
downloadCMake-7c3169417d2e7ef6dde0a145d9969a1db1470a55.zip
CMake-7c3169417d2e7ef6dde0a145d9969a1db1470a55.tar.gz
CMake-7c3169417d2e7ef6dde0a145d9969a1db1470a55.tar.bz2
Merge topic 'curl-debug-callback'
e243b379ca cmFileCommand: Fix signature of CURLOPT_DEBUGFUNCTION callback Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7288
Diffstat (limited to 'Source/cmFileCommand.cxx')
-rw-r--r--Source/cmFileCommand.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 27ec564..26006d8 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -1610,8 +1610,8 @@ size_t cmWriteToMemoryCallback(void* ptr, size_t size, size_t nmemb,
return realsize;
}
-size_t cmFileCommandCurlDebugCallback(CURL*, curl_infotype type, char* chPtr,
- size_t size, void* data)
+int cmFileCommandCurlDebugCallback(CURL*, curl_infotype type, char* chPtr,
+ size_t size, void* data)
{
cmFileCommandVectorOfChar& vec =
*static_cast<cmFileCommandVectorOfChar*>(data);