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/collector.h

    r424 r427  
    2929#include <wtf/OwnPtr.h> 
    3030#include <wtf/Threading.h> 
    31 #if USE(MULTIPLE_THREADS) 
     31 
     32// This is supremely lame that we require pthreads to build on windows. 
     33#if ENABLE(JSC_MULTIPLE_THREADS) 
    3234#include <pthread.h> 
    3335#endif 
    …… 
    132134        HashSet<ArgList*>* m_markListSet; 
    133135 
    134 #if USE(MULTIPLE_THREADS) 
     136#if ENABLE(JSC_MULTIPLE_THREADS) 
    135137        static void unregisterThread(void*); 
    136138        void unregisterThread();