diff options
Diffstat (limited to 'JavaScriptCore/config.h')
| -rw-r--r-- | JavaScriptCore/config.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/JavaScriptCore/config.h b/JavaScriptCore/config.h index d5fdfe9..9810885 100644 --- a/JavaScriptCore/config.h +++ b/JavaScriptCore/config.h @@ -25,7 +25,7 @@ #include <wtf/Platform.h> -#if OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) +#if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) #define JS_EXPORTDATA __declspec(dllexport) #else @@ -44,7 +44,7 @@ #define max max #define min min -#if !COMPILER(MSVC7) && !OS(WINCE) +#if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE) // We need to define this before the first #include of stdlib.h or it won't contain rand_s. #ifndef _CRT_RAND_S #define _CRT_RAND_S @@ -75,6 +75,12 @@ #include <wtf/DisallowCType.h> #endif +#if COMPILER(MSVC) +#define SKIP_STATIC_CONSTRUCTORS_ON_MSVC 1 +#else +#define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1 +#endif + #if PLATFORM(CHROMIUM) #if !defined(WTF_USE_V8) #define WTF_USE_V8 1 |