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

Merge branch 'hotfix-4787' into 'master'

hotfix-4787

See merge request !227
parents 150a769c d21d738d
No related branches found
No related tags found
1 merge request!227hotfix-4787
......@@ -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 35)
SET( CPACK_PACKAGE_VERSION_PATCH 36)
# init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}-${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\"")
......
Subproject commit 08c2d86263a3756f9185504ca5b38d75c9ca1b9f
Subproject commit f732f3d33d0d671cb566c60ceedaa2292b68109c
......@@ -91,7 +91,7 @@ int sig_unix_handler_deinit() {
//log_it(L_DEBUG, "Deinit");
if( s_pid_path )
DAP_DELETE(s_pid_path);
DAP_DELETE((void *)s_pid_path);
signal(SIGTERM, SIG_DFL);
signal(SIGINT, 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