From 73c964bf9def2e7ef4f97f518517882d1e3230b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 7 Feb 2019 15:11:33 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@714 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/thread/pithread.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src_main/thread/pithread.cpp b/src_main/thread/pithread.cpp index 0ad05b1c..3330bb6c 100755 --- a/src_main/thread/pithread.cpp +++ b/src_main/thread/pithread.cpp @@ -188,12 +188,12 @@ PIThread::~PIThread() { piMonitor.threads--; if (!running_ || PRIVATE->thread == 0) return; #ifdef FREERTOS + //void * ret(0); + pthread_join(PRIVATE->thread, 0); piCout << "FREERTOS can't terminate pthreads!"; - void * ret(0); - pthread_join(PRIVATE->thread, &ret); #endif #ifndef WINDOWS -# ifdef ANDROID +# ifdef ANDROIDe pthread_kill(PRIVATE->thread, SIGTERM); # else pthread_cancel(PRIVATE->thread);