thread/Thread: move code to Run()

1 files changed, 22 insertions, 14 deletions

diff --git a/src/thread/Thread.cxx b/src/thread/Thread.cxx
index 0042ad140..bdb7021fe 100644
--- a/src/thread/Thread.cxx
+++ b/src/thread/Thread.cxx
@@ -74,6 +74,26 @@ Thread::Join()
 #endif
 }
 
+inline void
+Thread::Run()
+{
+#ifndef WIN32
+#ifndef NDEBUG
+	/* this works around a race condition that causes an assertion
+	   failure due to IsInside() spuriously returning false right
+	   after the thread has been created, and the calling thread
+	   hasn't initialised "defined" yet */
+	defined = true;
+#endif
+#endif
+
+	f(ctx);
+
+#ifdef ANDROID
+	Java::DetachCurrentThread();
+#endif
+}
+
 #ifdef WIN32
 
 DWORD WINAPI
@@ -81,7 +101,7 @@ Thread::ThreadProc(LPVOID ctx)
 {
 	Thread &thread = *(Thread *)ctx;
 
-	thread.f(thread.ctx);
+	thread.Run();
 	return 0;
 }
 
@@ -92,19 +112,7 @@ Thread::ThreadProc(void *ctx)
 {
 	Thread &thread = *(Thread *)ctx;
 
-#ifndef NDEBUG
-	/* this works around a race condition that causes an assertion
-	   failure due to IsInside() spuriously returning false right
-	   after the thread has been created, and the calling thread
-	   hasn't initialised "defined" yet */
-	thread.defined = true;
-#endif
-
-	thread.f(thread.ctx);
-
-#ifdef ANDROID
-	Java::DetachCurrentThread();
-#endif
+	thread.Run();
 
 	return nullptr;
 }