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

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);