Show
Ignore:
Timestamp:
08/01/08 14:47:24 (5 months ago)
Author:
sroret
Message:

merge with webkit revision 35510

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/JavaScriptCore/kjs/JSGlobalData.cpp

    r424 r427  
    3333#include "CommonIdentifiers.h" 
    3434#include "JSClassRef.h" 
    35 #include "JSLock.h" 
    3635#include "Machine.h" 
    3736#include "Parser.h" 
    …… 
    4140#include "nodes.h" 
    4241 
    43 #if USE(MULTIPLE_THREADS) 
     42#if ENABLE(JSC_MULTIPLE_THREADS) 
    4443#include <wtf/Threading.h> 
    4544#endif 
    …… 
    6059    : machine(new Machine) 
    6160    , heap(new Heap(this)) 
    62 #if USE(MULTIPLE_THREADS) 
     61#if ENABLE(JSC_MULTIPLE_THREADS) 
    6362    , arrayTable(new HashTable(KJS::arrayTable)) 
    6463    , dateTable(new HashTable(KJS::dateTable)) 
    …… 
    8685    , parser(new Parser) 
    8786    , head(0) 
    88     , isSharedInstance(false) 
    8987{ 
    9088} 
    …… 
    9795    machine = 0; 
    9896 
    99 #if USE(MULTIPLE_THREADS) 
     97#if ENABLE(JSC_MULTIPLE_THREADS) 
    10098    arrayTable->deleteTable(); 
    10199    dateTable->deleteTable();