Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cellframe-sdk
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
20
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
cellframe-sdk
Commits
5da40a13
Commit
5da40a13
authored
4 years ago
by
dmitriy.gerasimov
Browse files
Options
Downloads
Plain Diff
Merge branch 'bugs-4609' into 'master'
bugs-4609 See merge request
!241
parents
3a0802b7
9842c883
No related branches found
No related tags found
3 merge requests
!251
Master
,
!250
Master
,
!241
bugs-4609
Pipeline
#6048
passed with stage
in 10 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
dap-sdk/net/client/dap_client.c
+1
-2
1 addition, 2 deletions
dap-sdk/net/client/dap_client.c
with
2 additions
and
3 deletions
CMakeLists.txt
+
1
−
1
View file @
5da40a13
...
...
@@ -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-2
4
"
)
set
(
CELLFRAME_SDK_NATIVE_VERSION
"2.6-2
5
"
)
add_definitions
(
"-DCELLFRAME_SDK_VERSION=
\"
${
CELLFRAME_SDK_NATIVE_VERSION
}
\"
"
)
set
(
DAPSDK_MODULES
""
)
...
...
This diff is collapsed.
Click to expand it.
dap-sdk/net/client/dap_client.c
+
1
−
2
View file @
5da40a13
...
...
@@ -186,7 +186,6 @@ void dap_client_set_auth_cert_unsafe(dap_client_t * a_client, dap_cert_t *a_cert
void
dap_client_delete_unsafe
(
dap_client_t
*
a_client
)
{
if
(
DAP_CLIENT_PVT
(
a_client
)
->
refs_count
==
0
){
DAP_CLIENT_PVT
(
a_client
)
->
delete_callback
(
a_client
,
NULL
);
dap_client_pvt_delete
(
DAP_CLIENT_PVT
(
a_client
)
);
pthread_mutex_destroy
(
&
a_client
->
mutex
);
DAP_DELETE
(
a_client
);
...
...
@@ -318,7 +317,7 @@ void dap_client_go_stage(dap_client_t * a_client, dap_client_stage_t a_stage_tar
assert
(
l_client_pvt
);
struct
go_stage_arg
*
l_stage_arg
=
DAP_NEW
(
struct
go_stage_arg
);
struct
go_stage_arg
*
l_stage_arg
=
DAP_NEW
_Z
(
struct
go_stage_arg
);
l_stage_arg
->
stage_end_callback
=
a_stage_end_callback
;
l_stage_arg
->
stage_target
=
a_stage_target
;
l_stage_arg
->
client_pvt
=
l_client_pvt
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment