[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

[wxWidgets.git] / src / unix / threadpsx.cpp

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index 3fdf392751585f76c825444e1387907168a1c8c4..e8aad25e50984bf824c220d0aef919c7c5b08037 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -10,7 +10,7 @@
 //                  Vadim Zeitlin (1999-2002)
 //                  Robert Roebling (1999)
 //                  K. S. Sreeram (2002)
 //                  Vadim Zeitlin (1999-2002)
 //                  Robert Roebling (1999)
 //                  K. S. Sreeram (2002)

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -37,6 +37,7 @@
 #include "wx/intl.h"
 #include "wx/dynarray.h"
 #include "wx/timer.h"
 #include "wx/intl.h"
 #include "wx/dynarray.h"
 #include "wx/timer.h"

+#include "wx/stopwatch.h"

 
 #include <stdio.h>
 #include <unistd.h>
 
 #include <stdio.h>
 #include <unistd.h>


@@ -969,7 +970,7 @@ void wxThread::Yield()
 
 void wxThread::Sleep(unsigned long milliseconds)
 {
 
 void wxThread::Sleep(unsigned long milliseconds)
 {

-    wxUsleep(milliseconds);
+    wxMilliSleep(milliseconds);

 }
 
 int wxThread::GetCPUCount()
 }
 
 int wxThread::GetCPUCount()


@@ -1483,6 +1484,12 @@ void wxThread::Exit(ExitCode status)
         //       only call one thread function at a time :-(
         DeleteThread(this);
     }
         //       only call one thread function at a time :-(
         DeleteThread(this);
     }

+    else
+    {
+        m_critsect.Enter();
+        m_internal->SetState(STATE_EXITED);
+        m_critsect.Leave();
+    }

 
     // terminate the thread (pthread_exit() never returns)
     pthread_exit(status);
 
     // terminate the thread (pthread_exit() never returns)
     pthread_exit(status);