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

    r416 r427  
    234234#endif 
    235235 
    236 /* multiple threads only supported on Mac for now */ 
    237 #if PLATFORM(MAC) || PLATFORM(WIN) 
    238 #define WTF_USE_MULTIPLE_THREADS 1 
     236#if (PLATFORM(MAC) || PLATFORM(WIN)) && !defined(ENABLE_JSC_MULTIPLE_THREADS) 
     237#define ENABLE_JSC_MULTIPLE_THREADS 1 
    239238#endif 
    240239 
    …… 
    260259#endif 
    261260 
    262 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(SYMBIAN) || PLATFORM(WIN) || PLATFORM(WX) 
     261#if (PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(SYMBIAN) || PLATFORM(WIN) || PLATFORM(WX)) && !defined(ENABLE_NETSCAPE_PLUGIN_API) 
    263262#define ENABLE_NETSCAPE_PLUGIN_API 1 
    264263#endif 
    …… 
    273272#endif 
    274273 
    275 #if PLATFORM(MAC) || PLATFORM(WIN) 
     274#if (PLATFORM(MAC) || PLATFORM(WIN)) && !defined(ENABLE_DASHBOARD_SUPPORT) 
    276275#define ENABLE_DASHBOARD_SUPPORT 1 
    277276#endif 
    …… 
    348347#endif 
    349348 
     349#if !defined(ENABLE_SAMPLING_TOOL) 
     350#define ENABLE_SAMPLING_TOOL 0 
     351#endif 
     352 
    350353#endif /* WTF_Platform_h */