Commit 25efcf87 by Marcus Winter

base_c: removed double code introduced by automerge

parent 60cb6593
...@@ -279,7 +279,6 @@ int embb_thread_join(embb_thread_t* thread, int *result_code) { ...@@ -279,7 +279,6 @@ int embb_thread_join(embb_thread_t* thread, int *result_code) {
return EMBB_ERROR; return EMBB_ERROR;
} }
int status = 0; int status = 0;
if (thread == NULL) return EMBB_ERROR;
status = pthread_join(thread->embb_internal_handle, NULL); status = pthread_join(thread->embb_internal_handle, NULL);
if (thread->embb_internal_arg != NULL) { if (thread->embb_internal_arg != NULL) {
if (result_code != NULL) { if (result_code != NULL) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment