diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-07-05 08:29:43 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-07-05 09:49:30 +0200 |
| commit | 40ed7685bfcb2a02376baefa874fc9e352f6bcd0 (patch) | |
| tree | 7eff08004bd6f39080be95aaa9f63ed12a3bba08 /CMake | |
| parent | fa289ea08e03c6029d99d029c105dbc7b6d82090 (diff) | |
| download | curl-40ed7685bfcb2a02376baefa874fc9e352f6bcd0.tar.gz | |
cmake: fix send/recv argument scanner for windows
... by simply trying the Windows argument types first.
Fixes #1640
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/OtherTests.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake index 3b203c538..989f04eb2 100644 --- a/CMake/OtherTests.cmake +++ b/CMake/OtherTests.cmake @@ -32,9 +32,9 @@ int main(void) { if(curl_cv_recv) if(NOT DEFINED curl_cv_func_recv_args OR "${curl_cv_func_recv_args}" STREQUAL "unknown") foreach(recv_retv "int" "ssize_t" ) - foreach(recv_arg1 "int" "ssize_t" "SOCKET") - foreach(recv_arg2 "void *" "char *") - foreach(recv_arg3 "size_t" "int" "socklen_t" "unsigned int") + foreach(recv_arg1 "SOCKET" "int" ) + foreach(recv_arg2 "char *" "void *" ) + foreach(recv_arg3 "int" "size_t" "socklen_t" "unsigned int") foreach(recv_arg4 "int" "unsigned int") if(NOT curl_cv_func_recv_done) unset(curl_cv_func_recv_test CACHE) @@ -96,9 +96,9 @@ int main(void) { if(curl_cv_send) if(NOT DEFINED curl_cv_func_send_args OR "${curl_cv_func_send_args}" STREQUAL "unknown") foreach(send_retv "int" "ssize_t" ) - foreach(send_arg1 "int" "ssize_t" "SOCKET") - foreach(send_arg2 "const void *" "void *" "char *" "const char *") - foreach(send_arg3 "size_t" "int" "socklen_t" "unsigned int") + foreach(send_arg1 "SOCKET" "int" "ssize_t" ) + foreach(send_arg2 "const char *" "const void *" "void *" "char *") + foreach(send_arg3 "int" "size_t" "socklen_t" "unsigned int") foreach(send_arg4 "int" "unsigned int") if(NOT curl_cv_func_send_done) unset(curl_cv_func_send_test CACHE) |