diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
| commit | 881da28418d380042aa95a97f0cbd42560a64f7c (patch) | |
| tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/JavaScriptCore/config.h | |
| parent | 7e104c57a70fdf551bb3d22a5d637cdcbc69dbea (diff) | |
| parent | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (diff) | |
| download | qtwebkit-881da28418d380042aa95a97f0cbd42560a64f7c.tar.gz | |
Merge 'wip/next' into dev
Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
Diffstat (limited to 'Source/JavaScriptCore/config.h')
| -rw-r--r-- | Source/JavaScriptCore/config.h | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/Source/JavaScriptCore/config.h b/Source/JavaScriptCore/config.h index a5df3aa7a..bea1bf048 100644 --- a/Source/JavaScriptCore/config.h +++ b/Source/JavaScriptCore/config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2006, 2007, 2008, 2013 Apple Inc. All rights reserved. * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> * * This library is free software; you can redistribute it and/or @@ -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> @@ -34,22 +30,24 @@ #endif #if OS(WINDOWS) -// If we don't define these, they get defined in windef.h. -// We want to use std::min and std::max -#define max max -#define min min -#if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE) +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x601 +#endif + +#ifndef WINVER +#define WINVER 0x0601 +#endif + +#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 @@ -63,3 +61,4 @@ #else #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1 #endif + |