diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/JavaScriptCore/config.h | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/JavaScriptCore/config.h')
| -rw-r--r-- | Source/JavaScriptCore/config.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/Source/JavaScriptCore/config.h b/Source/JavaScriptCore/config.h index beebec657..bea1bf048 100644 --- a/Source/JavaScriptCore/config.h +++ b/Source/JavaScriptCore/config.h @@ -19,12 +19,8 @@ * */ -#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H -#ifdef BUILDING_WITH_CMAKE +#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE) #include "cmakeconfig.h" -#else -#include "autotoolsconfig.h" -#endif #endif #include <wtf/Platform.h> @@ -36,24 +32,22 @@ #if OS(WINDOWS) #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0502 +#define _WIN32_WINNT 0x601 #endif #ifndef WINVER -#define WINVER 0x0502 +#define WINVER 0x0601 #endif -#if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE) +#if !COMPILER(MSVC7_OR_LOWER) // 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 #endif -#endif // !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE) +#endif // !COMPILER(MSVC7_OR_LOWER #endif // OS(WINDOWS) -#define WTF_CHANGES 1 - #ifdef __cplusplus #undef new #undef delete @@ -68,7 +62,3 @@ #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1 #endif -// Enable the following if you want to use the MacroAssembler::probe() facility -// to do JIT debugging. -#define WTF_USE_MASM_PROBE 0 - |