JavaScriptCore-576.tar.gz

[apple/javascriptcore.git] / runtime / InitializeThreading.cpp

diff --git a/runtime/InitializeThreading.cpp b/runtime/InitializeThreading.cpp
index cda9fb11ea87e658bbf9803964fb3a8016ae3252..2605a9a7cde0e52532a1ea1e16f1657b6da8fc81 100644 (file)
--- a/runtime/InitializeThreading.cpp
+++ b/runtime/InitializeThreading.cpp
@@ -29,20 +29,19 @@
 #include "config.h"
 #include "InitializeThreading.h"
 
 #include "config.h"
 #include "InitializeThreading.h"
 

-#include "JSImmediate.h"

 #include "Collector.h"
 #include "Collector.h"

-#include "DateMath.h"

 #include "dtoa.h"
 #include "Identifier.h"
 #include "JSGlobalObject.h"
 #include "UString.h"
 #include "dtoa.h"
 #include "Identifier.h"
 #include "JSGlobalObject.h"
 #include "UString.h"

+#include <wtf/DateMath.h>

 #include <wtf/Threading.h>
 
 using namespace WTF;
 
 namespace JSC {
 
 #include <wtf/Threading.h>
 
 using namespace WTF;
 
 namespace JSC {
 

-#if PLATFORM(DARWIN) && ENABLE(JSC_MULTIPLE_THREADS)
+#if OS(DARWIN) && ENABLE(JSC_MULTIPLE_THREADS)

 static pthread_once_t initializeThreadingKeyOnce = PTHREAD_ONCE_INIT;
 #endif
 
 static pthread_once_t initializeThreadingKeyOnce = PTHREAD_ONCE_INIT;
 #endif
 


@@ -50,15 +49,16 @@ static void initializeThreadingOnce()
 {
     WTF::initializeThreading();
     initializeUString();
 {
     WTF::initializeThreading();
     initializeUString();

+    JSGlobalData::storeVPtrs();

 #if ENABLE(JSC_MULTIPLE_THREADS)
     s_dtoaP5Mutex = new Mutex;
 #if ENABLE(JSC_MULTIPLE_THREADS)
     s_dtoaP5Mutex = new Mutex;

-    initDateMath();
+    initializeDates();

 #endif
 }
 
 void initializeThreading()
 {
 #endif
 }
 
 void initializeThreading()
 {

-#if PLATFORM(DARWIN) && ENABLE(JSC_MULTIPLE_THREADS)
+#if OS(DARWIN) && ENABLE(JSC_MULTIPLE_THREADS)

     pthread_once(&initializeThreadingKeyOnce, initializeThreadingOnce);
 #else
     static bool initializedThreading = false;
     pthread_once(&initializeThreadingKeyOnce, initializeThreadingOnce);
 #else
     static bool initializedThreading = false;