- make it compile for gcc2: step1

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
@@ -139,13 +139,13 @@ 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();
 }
 
@@ -154,5 +154,5 @@ 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;
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
@@ -30,5 +30,4 @@ extern "C"
 {
     void *_threadutil_start_thread( void* );
-    void _threadutil_terminate_thread( void* );
 }
 
@@ -91,6 +90,7 @@ namespace ThreadUtil
     {
         friend void *::_threadutil_start_thread( void* );
-        friend void ::_threadutil_terminate_thread( void* );
     public:
+        struct Data;
+
         Thread();
         virtual ~Thread();
@@ -108,5 +108,4 @@ namespace ThreadUtil
 
     private:
-        struct Data;
         Data *d;
     };