diff options
Diffstat (limited to 'WebCore/config.h')
| -rw-r--r-- | WebCore/config.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/WebCore/config.h b/WebCore/config.h index 6fa1f40..b8f3a05 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -25,7 +25,7 @@ #include <wtf/Platform.h> -#if PLATFORM(WIN_OS) && !defined(BUILDING_WX__) && !COMPILER(GCC) +#if OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) #define JS_EXPORTDATA __declspec(dllexport) #else @@ -36,8 +36,10 @@ #else #define WEBKIT_EXPORTDATA __declspec(dllimport) #endif +#define JS_EXPORTCLASS JS_EXPORTDATA #else #define JS_EXPORTDATA +#define JS_EXPORTCLASS #define WEBKIT_EXPORTDATA #endif @@ -47,7 +49,7 @@ #define HAVE_FUNC_USLEEP 1 #endif /* __APPLE__ */ -#if PLATFORM(WIN_OS) +#if OS(WINDOWS) #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0500 @@ -73,7 +75,7 @@ #endif #endif -#endif /* PLATFORM(WIN_OS) */ +#endif /* OS(WINDOWS) */ // ANDROID def should be after all PLATFORM to avoid override. #if PLATFORM(ANDROID) @@ -109,6 +111,7 @@ #endif #define ENABLE_XBL 0 +#define ENABLE_XHTMLMP 0 #define ENABLE_XPATH 0 #define ENABLE_XSLT 0 #undef ENABLE_ARCHIVE // Enabled by default in Platform.h @@ -264,7 +267,7 @@ #define WTF_USE_NEW_THEME 1 #endif // PLATFORM(MAC) -#if PLATFORM(SYMBIAN) +#if OS(SYMBIAN) #undef WIN32 #undef _WIN32 #undef SKIP_STATIC_CONSTRUCTORS_ON_GCC @@ -282,10 +285,10 @@ #if PLATFORM(CHROMIUM) -#if !PLATFORM(DARWIN) +#if !OS(DARWIN) // Define SKIA on non-Mac. #define WTF_PLATFORM_SKIA 1 -#endif /* !PLATFORM(DARWIN) */ +#endif /* !OS(DARWIN) */ // Chromium uses this file instead of JavaScriptCore/config.h to compile // JavaScriptCore/wtf (chromium doesn't compile the rest of JSC). Therefore, |