summaryrefslogtreecommitdiff
path: root/noncore
authorsimon <simon>2002-12-11 10:58:16 (UTC)
committer simon <simon>2002-12-11 10:58:16 (UTC)
commit616e7437498c7adcad77d9b79e9c450a75b260ca (patch) (side-by-side diff)
treeb5a5291eabfc779b671a7436a377cc4a455b95bf /noncore
parent6ee0a61001307e71f51d1e8c7beaa81a94df89aa (diff)
downloadopie-616e7437498c7adcad77d9b79e9c450a75b260ca.zip
opie-616e7437498c7adcad77d9b79e9c450a75b260ca.tar.gz
opie-616e7437498c7adcad77d9b79e9c450a75b260ca.tar.bz2
- make it compile for gcc2: step1
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/threadutil.cpp14
-rw-r--r--noncore/multimedia/opieplayer2/threadutil.h5
2 files changed, 9 insertions, 10 deletions
diff --git a/noncore/multimedia/opieplayer2/threadutil.cpp b/noncore/multimedia/opieplayer2/threadutil.cpp
index a5cc92d..7a9e1a4 100644
--- a/noncore/multimedia/opieplayer2/threadutil.cpp
+++ b/noncore/multimedia/opieplayer2/threadutil.cpp
@@ -138,22 +138,22 @@ struct Thread::Data
extern "C"
{
-void _threadutil_terminate_thread( void *arg )
+static void terminate_thread( void *arg )
{
- Thread *thr = ( Thread* )arg;
+ Thread::Data *data = ( Thread::Data* )arg;
- assert( thr );
+ assert( data );
- AutoLock locker( thr->d->guard );
- thr->d->isRunning = false;
- thr->d->finishCondition.wakeAll();
+ AutoLock locker( data->guard );
+ data->isRunning = false;
+ data->finishCondition.wakeAll();
}
void *_threadutil_start_thread( void *arg )
{
Thread *thr = ( Thread* )arg;
- pthread_cleanup_push( _threadutil_terminate_thread, thr );
+ pthread_cleanup_push( terminate_thread, thr->d );
thr->d->isRunning = true;
thr->run();
diff --git a/noncore/multimedia/opieplayer2/threadutil.h b/noncore/multimedia/opieplayer2/threadutil.h
index b67b61d..21ae6b2 100644
--- a/noncore/multimedia/opieplayer2/threadutil.h
+++ b/noncore/multimedia/opieplayer2/threadutil.h
@@ -29,7 +29,6 @@ class QSocketNotifier;
extern "C"
{
void *_threadutil_start_thread( void* );
- void _threadutil_terminate_thread( void* );
}
namespace ThreadUtil
@@ -90,8 +89,9 @@ namespace ThreadUtil
class Thread
{
friend void *::_threadutil_start_thread( void* );
- friend void ::_threadutil_terminate_thread( void* );
public:
+ struct Data;
+
Thread();
virtual ~Thread();
@@ -107,7 +107,6 @@ namespace ThreadUtil
virtual void run() = 0;
private:
- struct Data;
Data *d;
};