From 2ed5c1643fb551c53b9a9a6cf05b9b1b722772a7 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:23:34 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@715 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/thread/pithread.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src_main/thread/pithread.cpp b/src_main/thread/pithread.cpp index 3330bb6c..360d6d47 100755 --- a/src_main/thread/pithread.cpp +++ b/src_main/thread/pithread.cpp @@ -189,18 +189,19 @@ PIThread::~PIThread() { if (!running_ || PRIVATE->thread == 0) return; #ifdef FREERTOS //void * ret(0); - pthread_join(PRIVATE->thread, 0); + piCout << pthread_join(PRIVATE->thread, 0); piCout << "FREERTOS can't terminate pthreads!"; -#endif -#ifndef WINDOWS -# ifdef ANDROIDe - pthread_kill(PRIVATE->thread, SIGTERM); -# else - pthread_cancel(PRIVATE->thread); -# endif #else +#ifndef WINDOWS +# ifdef ANDROID + pthread_kill(PRIVATE->thread, SIGTERM); +# else + pthread_cancel(PRIVATE->thread); +# endif +# else TerminateThread(PRIVATE->thread, 0); CloseHandle(PRIVATE->thread); +# endif #endif terminating = running_ = false; }