- gcc2 is not my friend, given that it can't deal with friend declarations

  properly :) (a.k.a: make it compile with gcc2, step 2)

2 files changed, 11 insertions, 12 deletions

diff --git a/noncore/multimedia/opieplayer2/threadutil.cpp b/noncore/multimedia/opieplayer2/threadutil.cpp
index 7a9e1a4..ff38b1e 100644
--- a/noncore/multimedia/opieplayer2/threadutil.cpp
+++ b/noncore/multimedia/opieplayer2/threadutil.cpp
@@ -132,8 +132,12 @@ struct Thread::Data
     Mutex guard;
     bool isRunning;
 
     WaitCondition finishCondition;
+
+    Thread *thr;
+
+    void run() { thr->run(); }
 };
 
 extern "C"
 {
@@ -148,16 +152,16 @@ static void terminate_thread( void *arg )
     data->isRunning = false;
     data->finishCondition.wakeAll();
 }
 
-void *_threadutil_start_thread( void *arg )
+static void *start_thread( void *arg )
 {
-    Thread *thr = ( Thread* )arg;
+    Thread::Data *data = ( Thread::Data* )arg;
 
-    pthread_cleanup_push( terminate_thread, thr->d );
+    pthread_cleanup_push( terminate_thread, data );
 
-    thr->d->isRunning = true;
-    thr->run();
+    data->isRunning = true;
+    data->run();
 
     pthread_cleanup_pop( true );
 
     Thread::exit();
@@ -168,8 +172,9 @@ void *_threadutil_start_thread( void *arg )
 
 Thread::Thread()
     : d( new Data )
 {
+    d->thr = this;
 }
 
 Thread::~Thread()
 {
@@ -188,9 +193,9 @@ void Thread::start()
 
     pthread_attr_t attributes;
     pthread_attr_init( &attributes );
     pthread_attr_setscope( &attributes, PTHREAD_SCOPE_SYSTEM );
-    int err = pthread_create( &d->self, &attributes, _threadutil_start_thread, ( void* )this );
+    int err = pthread_create( &d->self, &attributes, start_thread, ( void* )d );
     if ( err != 0 ) {
         qDebug( "ThreadUtil::Thread::start() : can't create thread: %s", strerror( err ) );
         pthread_attr_destroy( &attributes );
         return;
diff --git a/noncore/multimedia/opieplayer2/threadutil.h b/noncore/multimedia/opieplayer2/threadutil.h
index 21ae6b2..2fd0c68 100644
--- a/noncore/multimedia/opieplayer2/threadutil.h
+++ b/noncore/multimedia/opieplayer2/threadutil.h
@@ -25,13 +25,8 @@
 #include <qguardedptr.h>
 
 class QSocketNotifier;
 
-extern "C"
-{
-    void *_threadutil_start_thread( void* );
-}
-
 namespace ThreadUtil
 {
 
     class Mutex
@@ -87,9 +82,8 @@ namespace ThreadUtil
     };
 
     class Thread
     {
-        friend void *::_threadutil_start_thread( void* );
     public:
         struct Data;
 
         Thread();