From 6882a04fb36642862b11efe514251d32070c3d65 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 25 Aug 2016 19:20:41 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev --- Source/JavaScriptCore/config.h | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'Source/JavaScriptCore/config.h') 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 * * 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 @@ -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 + -- cgit v1.2.1