From 44be5c6b03c44f9d27f71c6cae9c99d54da6d6ae Mon Sep 17 00:00:00 2001
From: Constantin Papizh <p.const@bk.ru>
Date: Wed, 8 Apr 2020 14:54:30 +0300
Subject: [PATCH] Linking errors
---
CMakeLists.txt | 6 +-----
dap_chain_net.c | 3 ++-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e8bf8c337..174b4169e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,12 +56,8 @@ if(WIN32)
add_definitions ("-D_POSIX_THREAD_SAFE_FUNCTIONS")
add_definitions ("-DNODE_NETNAME=\"cellframe\"")
add_compile_definitions(_GNU_SOURCE)
- include_directories(../libdap/src/win32/)
- include_directories(../3rdparty/wepoll/include/)
+ include_directories(../3rdparty/wepoll/)
include_directories(../3rdparty/uthash/src/)
- include_directories(../3rdparty/libjson-c/)
- include_directories(../3rdparty/curl/include/)
- include_directories(../3rdparty/libsqlite3/)
endif()
add_library(${PROJECT_NAME} STATIC ${DAP_CHAIN_NET_SRCS} ${DAP_CHAIN_NET_HEADERS} ${IPUTILS_SRCS} ${IPUTILS_HEADERS})
diff --git a/dap_chain_net.c b/dap_chain_net.c
index 8eafe041e0..16d80222db 100755
--- a/dap_chain_net.c
+++ b/dap_chain_net.c
@@ -820,10 +820,11 @@ static void *s_net_proc_thread ( void *a_net )
// wait if flag not set then go to SYNC_GDB
if(!(PVT(l_net)->flags & F_DAP_CHAIN_NET_GO_SYNC)) {
+ struct timespec l_to;
#ifndef _WIN32
pthread_mutex_lock( &p_net->state_mutex_cond );
// prepare for signal waiting
- struct timespec l_to;
+
clock_gettime( CLOCK_MONOTONIC, &l_to );
int64_t l_nsec_new = l_to.tv_nsec + l_timeout_ms * 1000000ll;
--
GitLab