Merge pull request #106 from ConfettiFX/confetti-dev

Release 1.27 - April 25th, 2019 - Spring House Cleaning Release :-)
ConfettiFX · Apr 25, 2019 · a06e0ee · a06e0ee
2 parents 518f915 + 5031bef
commit a06e0ee
Show file tree

Hide file tree

Showing 113 changed files with 1,459 additions and 1,749 deletions.
diff --git a/Common_3/OS/Android/AndroidThreadManager.cpp b/Common_3/OS/Android/AndroidThreadManager.cpp
@@ -70,7 +70,7 @@ void Mutex::Release() { pthread_mutex_unlock(&pHandle); }
 
 void* ThreadFunctionStatic(void* data)
 {
-	WorkItem* pItem = static_cast<WorkItem*>(data);
+	ThreadDesc* pItem = static_cast<ThreadDesc*>(data);
 	pItem->pFunc(pItem->pData);
 	return 0;
 }
@@ -112,7 +112,7 @@ ThreadID Thread::GetCurrentThreadID() { return pthread_self(); }
 
 bool Thread::IsMainThread() { return GetCurrentThreadID() == mainThreadID; }
 
-ThreadHandle _createThread(WorkItem* pData)
+ThreadHandle _createThread(ThreadDesc* pData)
 {
 	pthread_t handle;
 	pthread_create(&handle, NULL, ThreadFunctionStatic, pData);
@@ -126,7 +126,7 @@ void _destroyThread(ThreadHandle handle)
 	pthread_join(handle, NULL);
 }
 
-ThreadHandle create_thread(WorkItem* pData)
+ThreadHandle create_thread(ThreadDesc* pData)
 {
 	pthread_t handle;
 	pthread_create(&handle,NULL,ThreadFunctionStatic,pData);