- 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
@@ -135,2 +135,6 @@ struct Thread::Data
     WaitCondition finishCondition;
+
+    Thread *thr;
+
+    void run() { thr->run(); }
 };
@@ -151,10 +155,10 @@ static void terminate_thread( void *arg )
 
-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();
 
@@ -171,2 +175,3 @@ Thread::Thread()
 {
+    d->thr = this;
 }
@@ -191,3 +196,3 @@ void Thread::start()
     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 ) {
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
@@ -28,7 +28,2 @@ class QSocketNotifier;
 
-extern "C"
-{
-    void *_threadutil_start_thread( void* );
-}
-
 namespace ThreadUtil
@@ -90,3 +85,2 @@ namespace ThreadUtil
     {
-        friend void *::_threadutil_start_thread( void* );
     public: