From ac982cae2a6c50592846389e0695c1682b1ac8f6 Mon Sep 17 00:00:00 2001 From: cwyy Date: Sat, 30 Jun 2018 14:10:38 +0800 Subject: [PATCH] fix compile error with vs2017 and boost 1.67 --- CMakeLists.txt | 6 +++++- src/network/tcp_socket.cpp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 107b805..fa3fcbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -511,7 +511,11 @@ ENDIF() IF("${OPENSSL_ROOT_DIR}" STREQUAL "") get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_INCLUDE_DIR}/.." REALPATH) ENDIF() - SET(OPENSSL_CONF_SOURCE "${OPENSSL_ROOT_DIR}/ssl/openssl.cnf") + IF("${OPENSSL_ROOT_DIR}" STREQUAL "C:/Program Files/OpenSSL") + SET(OPENSSL_CONF_SOURCE "C:/Program Files/Common Files/SSL/openssl.cnf") + ELSE() + SET(OPENSSL_CONF_SOURCE "${OPENSSL_ROOT_DIR}/ssl/openssl.cnf") + ENDIF() IF(MINGW) SET(OPENSSL_CONF_SOURCE "${OPENSSL_ROOT_DIR}/openssl.cnf") ENDIF(MINGW) diff --git a/src/network/tcp_socket.cpp b/src/network/tcp_socket.cpp index e521c41..0012ba6 100644 --- a/src/network/tcp_socket.cpp +++ b/src/network/tcp_socket.cpp @@ -177,7 +177,7 @@ namespace fc { keepalive_settings.keepaliveinterval = (ULONG)(interval.count() / fc::milliseconds(1).count()); DWORD dwBytesRet = 0; - if (WSAIoctl(my->_sock.native(), SIO_KEEPALIVE_VALS, &keepalive_settings, sizeof(keepalive_settings), + if (WSAIoctl(my->_sock.native_handle(), SIO_KEEPALIVE_VALS, &keepalive_settings, sizeof(keepalive_settings), NULL, 0, &dwBytesRet, NULL, NULL) == SOCKET_ERROR) wlog("Error setting TCP keepalive values"); #elif !defined(__clang__) || (__clang_major__ >= 6)