CDRIVER-2080 detect socket API parameters for legacy platforms #427
Conversation
malexzx
force-pushed
the
master
branch
5 times, most recently
from
772c1e4
to
a4d41cb
Compare
CMakeLists.txt
Outdated
|
|
||
| include(CheckTypeSize) | ||
| if (MSVC) | ||
| SET(CMAKE_EXTRA_INCLUDE_FILES "ws2tcpip.h") |
There was a problem hiding this comment.
Have you confirmed this change for the Windows build is correct?
There was a problem hiding this comment.
that check not need for Windows.
Only socklen_t type. But I will try to check.
CMakeLists.txt
Outdated
| TRY_COMPILE(RES ${CMAKE_CURRENT_BINARY_DIR} | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/accept_test.cxx CMAKE_FLAGS | ||
| "-DCMAKE_CXX_LINK_EXECUTABLE='echo not linking now...'" OUTPUT_VARIABLE | ||
| LOG2) |
There was a problem hiding this comment.
For the Autotools version it was important to pass "-Werror" to the compiler when testing each combination of parameter types, in order to ensure that we had found the exact right types, rather than a combination of types that the compiler would accept with a warning:
https://github.com/mongodb/mongo-c-driver/blob/master/build/autotools/m4/ax_prototype.m4#L220
Do you need to pass "-Werror" to clang and gcc here, and perhaps "/WX" if (MSVC)?
There was a problem hiding this comment.
ok, that would be more right.
CMakeLists.txt
Outdated
| math(EXPR MONGOC_ACCEPT_ARG3_LIST_LEN_R "${MONGOC_ACCEPT_ARG3_LIST_LEN} - 1") | ||
|
|
||
| foreach(MONGOC_ACCEPT_ARG2_L RANGE ${MONGOC_ACCEPT_ARG2_LIST_LEN_R}) | ||
| foreach(MONGOC_ACCEPT_ARG3_L RANGE ${MONGOC_ACCEPT_ARG3_LIST_LEN_R}) |
There was a problem hiding this comment.
why not just?:
foreach (MONGOC_ACCEPT_ARG2_VAL in "struct sockaddr" "void")
foreach (MONGOC_ACCEPT_ARG3_VAL in "socklen_t" "size_t" "int")
Why do we need an indexed loop instead of looping over the values directly?
There was a problem hiding this comment.
yes, that's correct. I'll change this ASAP.
|
This looks very clever, thanks for the contribution. Quick question, how are you installing CMake on HP-UX? I tried from a 3.7.2 source download and got: |
|
cmake built on our host's with gcc-4.8.5 compiller. |
|
I've improved checking of arguments now |
|
Merged, thank you: |
add detection code to CMakeLists.txt