diff --git a/CMakeLists.txt b/CMakeLists.txt index 2594c15a5c4feb7603676ee11c7bc466c923f8ab..1e04fb59a169d62f8d758bd2be989f18d1a2c06c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.0) project (dap_chain_net) + set(DAP_CHAIN_NET_SRCS dap_chain_net.c dap_chain_net_remote.c @@ -70,13 +71,13 @@ if(WIN32) endif() if(UNIX) - target_link_libraries(dap_chain_net dap_core dap_crypto dap_client dap_stream_ch_chain dap_chain_gdb dap_stream_ch_chain_net dap_chain + target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_client dap_stream_ch_chain dap_chain_gdb dap_stream_ch_chain_net dap_chain dap_chain_crypto dap_chain_wallet dap_chain_net_srv dap_chain_net_srv_vpn dap_chain_mempool dap_chain_global_db - resolv +# resolv ) endif() -target_include_directories(dap_chain_net INTERFACE . PUBLIC ${IPUTILS_INCLUDE_DIRS}) +target_include_directories(${PROJECT_NAME} INTERFACE . PUBLIC ${IPUTILS_INCLUDE_DIRS}) set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE) diff --git a/dap_chain_node_ping.c b/dap_chain_node_ping.c index fbb1f8466ed9923c2ee9235afc4361e6daa8f330..39a3ad083d986dcf6c357d059c854e652f6dabeb 100644 --- a/dap_chain_node_ping.c +++ b/dap_chain_node_ping.c @@ -165,7 +165,7 @@ int wait_node_ping(pthread_t l_thread, int timeout_ms) timeout_ms *= 1000; l_wait_time.tv_sec += timeout_ms / DAP_USEC_PER_SEC; l_wait_time.tv_nsec += 1000 * (timeout_ms % DAP_USEC_PER_SEC); -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(__ANDROID__) int res = pthread_timedjoin_np(l_thread, (void **) &l_ping_time, &l_wait_time); #else int res = pthread_join(l_thread, (void **) &l_ping_time); diff --git a/iputils/iputils.h b/iputils/iputils.h index 677bcc2951a274ead3a5b88e367a5dac85196c71..0330b548f1a23b5b677a4218683a933a169669e5 100644 --- a/iputils/iputils.h +++ b/iputils/iputils.h @@ -20,6 +20,7 @@ #define uid_t uint32_t #endif #include <setjmp.h> +#include <sys/time.h> #ifdef __cplusplus extern "C" {