Commit | Line | Data |
---|---|---|
ddfffe67 MD |
1 | diff --git a/daemon/util/Thread.cpp b/daemon/util/Thread.cpp |
2 | index 199005f..61b5bcb 100644 | |
3 | --- a/daemon/util/Thread.cpp | |
4 | +++ b/daemon/util/Thread.cpp | |
5 | @@ -111,7 +111,7 @@ void Thread::Start() | |
6 | pthread_attr_t m_attr; | |
7 | pthread_attr_init(&m_attr); | |
8 | pthread_attr_setdetachstate(&m_attr, PTHREAD_CREATE_DETACHED); | |
9 | - pthread_attr_setinheritsched(&m_attr, PTHREAD_INHERIT_SCHED); | |
10 | + //pthread_attr_setinheritsched(&m_attr, PTHREAD_INHERIT_SCHED); | |
11 | m_running = !pthread_create(&m_threadObj, &m_attr, Thread::thread_handler, (void *) this); | |
12 | pthread_attr_destroy(&m_attr); | |
13 | #endif | |
14 | @@ -140,7 +140,7 @@ bool Thread::Kill() | |
15 | #ifdef WIN32 | |
16 | bool terminated = TerminateThread(m_threadObj, 0) != 0; | |
17 | #else | |
18 | - bool terminated = pthread_cancel(m_threadObj) == 0; | |
19 | + bool terminated = pthread_kill(m_threadObj, 0) == 0; | |
20 | #endif | |
21 | ||
22 | if (terminated) |