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

    r404 r427  
    218218#endif 
    219219 
    220 /* multiple threads only supported on Mac for now */ 
    221 #if PLATFORM(MAC) || PLATFORM(WIN) 
    222 #define WTF_USE_MULTIPLE_THREADS 1 
     220#if (PLATFORM(MAC) || PLATFORM(WIN)) && !defined(ENABLE_JSC_MULTIPLE_THREADS) 
     221#define ENABLE_JSC_MULTIPLE_THREADS 1 
    223222#endif 
    224223 
    …… 
    244243#endif 
    245244 
    246 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(SYMBIAN) || PLATFORM(WIN) || PLATFORM(WX) 
     245#if (PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(SYMBIAN) || PLATFORM(WIN) || PLATFORM(WX)) && !defined(ENABLE_NETSCAPE_PLUGIN_API) 
    247246#define ENABLE_NETSCAPE_PLUGIN_API 1 
    248247#endif 
    …… 
    257256#endif 
    258257 
    259 #if PLATFORM(MAC) || PLATFORM(WIN) 
     258#if (PLATFORM(MAC) || PLATFORM(WIN)) && !defined(ENABLE_DASHBOARD_SUPPORT) 
    260259#define ENABLE_DASHBOARD_SUPPORT 1 
    261260#endif 
    …… 
    325324#endif 
    326325 
     326#if !defined(ENABLE_SAMPLING_TOOL) 
     327#define ENABLE_SAMPLING_TOOL 0 
     328#endif 
     329 
    327330#endif /* WTF_Platform_h */