Skip to content
Snippets Groups Projects
Commit e23efa51 authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'bugs-4761' into 'release-4.4'

Bugs 4761

See merge request !209
parents 29e3155c 5e340dcb
No related branches found
No related tags found
2 merge requests!226Release 4.4,!209Bugs 4761
......@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 4)
SET( CPACK_PACKAGE_VERSION_MINOR 4)
SET( CPACK_PACKAGE_VERSION_PATCH 0)
SET( CPACK_PACKAGE_VERSION_PATCH 1)
# init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}-${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\"")
......
Subproject commit ca89718a48f90b97eb98fe6a96091aab867e0f44
Subproject commit 6fb36720101637b42ed8c1a1cac78652c39d00fa
Subproject commit 02081d14b184f7a07a37f68a180a5ca21f01042e
Subproject commit 4f9d6a2e733780c3465670dab0e6b12f20e2cc68
......@@ -47,7 +47,7 @@ int sig_unix_handler_init(const char *a_pid_path)
int sig_unix_handler_deinit() {
if( s_pid_path )
DAP_DELETE(s_pid_path);
DAP_DELETE((void *)s_pid_path);
signal(SIGTERM, SIG_DFL);
signal(SIGINT, SIG_DFL);
signal(SIGHUP, SIG_DFL);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment