Updated list of subprojects.

[wxWidgets.git] / src / mac / carbon / thread.cpp

diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp
index 88e9abb5e023cd03c79faa3f799174842e4971d2..b747d70922e1bb8ba0005ff9f073a15b628723ed 100644 (file)
--- a/src/mac/carbon/thread.cpp
+++ b/src/mac/carbon/thread.cpp
@@ -1,28 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:          src/mac/carbon/thread.cpp
-// Purpose:      wxThread Implementation
-// Author:        Original from Wolfram Gloger/Guilhem Lavaux/Vadim Zeitlin
+// Name:        src/mac/carbon/thread.cpp
+// Purpose:     wxThread Implementation
+// Author:      Original from Wolfram Gloger/Guilhem Lavaux/Vadim Zeitlin

 // Modified by: Aj Lavin, Stefan Csomor
 // Modified by: Aj Lavin, Stefan Csomor

-// Created:       04/22/98
-// RCS-ID:        $Id$
-// Copyright:    (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998),
-//                     Vadim Zeitlin (1999), Stefan Csomor (2000)
-// Licence:        wxWindows licence
+// Created:     04/22/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998),
+//                  Vadim Zeitlin (1999), Stefan Csomor (2000)
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
+    #include "wx/wx.h"
+    #include "wx/module.h"

 #endif
 
 #if wxUSE_THREADS
 
 #endif
 
 #if wxUSE_THREADS
 

-#include "wx/module.h"

 #include "wx/thread.h"
 
 #ifdef __WXMAC__
 #include "wx/thread.h"
 
 #ifdef __WXMAC__


@@ -31,7 +31,6 @@
 #else
     #include <DriverServices.h>
     #include <Multiprocessing.h>
 #else
     #include <DriverServices.h>
     #include <Multiprocessing.h>

-    #include "wx/math.h"

 #endif
 
 #include "wx/mac/uma.h"
 #endif
 
 #include "wx/mac/uma.h"


@@ -1040,7 +1039,7 @@ OSStatus wxThreadInternal::MacThreadStart(void *parameter)
     wxThreadInternal *pthread = thread->m_internal;
 
     // add to TLS so that This() will work
     wxThreadInternal *pthread = thread->m_internal;
 
     // add to TLS so that This() will work

-    verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread , (long) thread ) ) ;
+    verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread , (TaskStorageValue) thread ) ) ;

 
     // have to declare this before pthread_cleanup_push() which defines a
     // block!
 
     // have to declare this before pthread_cleanup_push() which defines a
     // block!


@@ -1641,7 +1640,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 
 bool wxThreadModule::OnInit()
 {
 
 bool wxThreadModule::OnInit()
 {

-    bool hasThreadManager = MPLibraryIsLoaded();
+    bool hasThreadManager = 
+#ifdef __LP64__ 
+        true ; // TODO VERIFY IN NEXT BUILD
+#else
+        MPLibraryIsLoaded();
+#endif

 
     if ( !hasThreadManager )
     {
 
     if ( !hasThreadManager )
     {