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/wtf/FastMalloc.cpp

    r387 r427  
    7979 
    8080#include "Assertions.h" 
    81 #if USE(MULTIPLE_THREADS) 
     81#if ENABLE(JSC_MULTIPLE_THREADS) 
    8282#include <pthread.h> 
    8383#endif 
    …… 
    100100namespace WTF { 
    101101 
    102 #if USE(MULTIPLE_THREADS) 
     102#if ENABLE(JSC_MULTIPLE_THREADS) 
    103103static pthread_key_t isForbiddenKey; 
    104104static pthread_once_t isForbiddenKeyOnce = PTHREAD_ONCE_INIT; 
    …… 
    143143    staticIsForbidden = false; 
    144144} 
    145 #endif // USE(MULTIPLE_THREADS) 
     145#endif // ENABLE(JSC_MULTIPLE_THREADS) 
    146146 
    147147} // namespace WTF