Show
Ignore:
Timestamp:
08/15/08 13:25:16 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35774

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/JavaScriptCore/wtf/ThreadingGtk.cpp

    r424 r437  
    5050void initializeThreading() 
    5151{ 
    52     if (!g_thread_supported()) { 
     52    if (!g_thread_supported()) 
    5353        g_thread_init(NULL); 
    54         ASSERT(!atomicallyInitializedStaticMutex); 
     54    ASSERT(g_thread_supported()); 
     55 
     56    if (!atomicallyInitializedStaticMutex) { 
    5557        atomicallyInitializedStaticMutex = new Mutex; 
    5658        threadMapMutex(); 
     
    5860        mainThreadIdentifier = currentThread(); 
    5961    } 
    60     ASSERT(g_thread_supported()); 
    6162} 
    6263