git-svn-id: svn://db.shs.com.ru/pip@715 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

This commit is contained in:
2019-02-07 15:23:34 +00:00
parent 73c964bf9d
commit 2ed5c1643f

View File

@@ -189,18 +189,19 @@ PIThread::~PIThread() {
if (!running_ || PRIVATE->thread == 0) return; if (!running_ || PRIVATE->thread == 0) return;
#ifdef FREERTOS #ifdef FREERTOS
//void * ret(0); //void * ret(0);
pthread_join(PRIVATE->thread, 0); piCout << pthread_join(PRIVATE->thread, 0);
piCout << "FREERTOS can't terminate pthreads!"; piCout << "FREERTOS can't terminate pthreads!";
#endif #else
#ifndef WINDOWS #ifndef WINDOWS
# ifdef ANDROIDe # ifdef ANDROID
pthread_kill(PRIVATE->thread, SIGTERM); pthread_kill(PRIVATE->thread, SIGTERM);
# else # else
pthread_cancel(PRIVATE->thread); pthread_cancel(PRIVATE->thread);
# endif # endif
#else # else
TerminateThread(PRIVATE->thread, 0); TerminateThread(PRIVATE->thread, 0);
CloseHandle(PRIVATE->thread); CloseHandle(PRIVATE->thread);
# endif
#endif #endif
terminating = running_ = false; terminating = running_ = false;
} }