summaryrefslogtreecommitdiff
path: root/src/thread.cc
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2015-08-13 19:31:39 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2015-08-13 19:31:39 +0200
commit36faa43c90023297377d56662d310743d93b938f (patch)
treed2a5a6ad434139055af1ad4914cbca5065fe8309 /src/thread.cc
parenta611e1e4dad81cde86165844b4cd078799f3f10d (diff)
Clean up thread code.
Diffstat (limited to 'src/thread.cc')
-rw-r--r--src/thread.cc40
1 files changed, 12 insertions, 28 deletions
diff --git a/src/thread.cc b/src/thread.cc
index 8abf3cb..6e216e9 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -29,18 +29,6 @@
#include <stdio.h>
#include <hugin.hpp>
-#ifdef WIN32
-static DWORD WINAPI thread_run(void *data)
-#else
-static void* thread_run(void *data)
-#endif/*WIN32*/
-{
- DEBUG(thread, "Thread run\n");
- Thread *t = (Thread*)data;
- t->thread_main();
- return 0;
-}
-
Thread::Thread()
{}
@@ -66,19 +54,15 @@ void Thread::wait_stop()
#endif/*WIN32*/
}
-#ifdef TEST_THREAD
-//Additional dependency files
-//deps:
-//Required cflags (autoconf vars may be used)
-//cflags:
-//Required link options (autoconf vars may be used)
-//libs:
-#include "test.h"
-
-TEST_BEGIN;
-
-// TODO: Put some testcode here (see test.h for usable macros).
-
-TEST_END;
-
-#endif/*TEST_THREAD*/
+#ifdef WIN32
+DWORD WINAPI
+#else
+void*
+#endif/*WIN32*/
+Thread::thread_run(void *data)
+{
+ DEBUG(thread, "Thread run\n");
+ Thread *t = (Thread*)data;
+ t->thread_main();
+ return 0;
+}