diff --git a/CMakeLists.txt b/CMakeLists.txt index e7c2769e13491bf68f760f7f8f698594ef876d9d..32a17b453dafe5cd13af883e9668e785c0b82096 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ project(cellframe-sdk C) cmake_minimum_required(VERSION 2.8) set(CMAKE_C_STANDARD 11) -set(CELLFRAME_SDK_NATIVE_VERSION "2.6-74") +set(CELLFRAME_SDK_NATIVE_VERSION "2.6-75") add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"") set(DAPSDK_MODULES "") diff --git a/dap-sdk/core/libdap.pri b/dap-sdk/core/libdap.pri index 11c3e3aee2032d74ae443f7adc330aae07530a6d..d4d940c2c5ed51dafcd7860369b597850498c11f 100755 --- a/dap-sdk/core/libdap.pri +++ b/dap-sdk/core/libdap.pri @@ -8,6 +8,9 @@ unix { DEFINES += DAP_OS_UNIX } DEFINES += _GNU_SOURCE +android { + DEFINES += DAP_OS_ANDROID +} unix: !android { LIBS += -lrt diff --git a/dap-sdk/net/core/dap_events_socket.c b/dap-sdk/net/core/dap_events_socket.c index f1de15d47965bbea8aee2037bc785bcebf7783cf..78c3f3ea830199358ea7502cf52f84189176d5bb 100644 --- a/dap-sdk/net/core/dap_events_socket.c +++ b/dap-sdk/net/core/dap_events_socket.c @@ -200,7 +200,7 @@ void dap_events_socket_reassign_between_workers_unsafe(dap_events_socket_t * a_e if (a_es->callbacks.worker_unassign_callback) a_es->callbacks.worker_unassign_callback(a_es, a_es->worker); - dap_events_socket_assign_on_worker_mt( a_es, a_worker_new ); + dap_worker_add_events_socket_unsafe(a_es, a_worker_new); } void dap_events_socket_reassign_between_workers_mt(dap_worker_t * a_worker_old, dap_events_socket_t * a_es, dap_worker_t * a_worker_new)