git-svn-id: svn://db.shs.com.ru/pip@715 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
@@ -189,11 +189,11 @@ 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
|
||||
#else
|
||||
#ifndef WINDOWS
|
||||
# ifdef ANDROIDe
|
||||
# ifdef ANDROID
|
||||
pthread_kill(PRIVATE->thread, SIGTERM);
|
||||
# else
|
||||
pthread_cancel(PRIVATE->thread);
|
||||
@@ -201,6 +201,7 @@ PIThread::~PIThread() {
|
||||
# else
|
||||
TerminateThread(PRIVATE->thread, 0);
|
||||
CloseHandle(PRIVATE->thread);
|
||||
# endif
|
||||
#endif
|
||||
terminating = running_ = false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user