diff options
Diffstat (limited to 'Source/WebCore/config.h')
| -rw-r--r-- | Source/WebCore/config.h | 63 |
1 files changed, 27 insertions, 36 deletions
diff --git a/Source/WebCore/config.h b/Source/WebCore/config.h index d0be35d94..e31f88fd3 100644 --- a/Source/WebCore/config.h +++ b/Source/WebCore/config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2006, 2013 Apple Inc. + * Copyright (C) 2004, 2005, 2006, 2013, 2014 Apple Inc. All rights reserved. * Copyright (C) 2009 Google Inc. All rights reserved. * * This library is free software; you can redistribute it and/or @@ -19,18 +19,14 @@ * */ -#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> -#if PLATFORM(MAC) || PLATFORM(IOS) -#define WTF_USE_FILE_LOCK 1 +#if PLATFORM(COCOA) +#define USE_FILE_LOCK 1 #endif #if PLATFORM(WIN) && !USE(WINGDI) @@ -47,13 +43,13 @@ #endif /* __APPLE__ */ #if OS(WINDOWS) -// If we don't define these, they get defined in windef.h. -// We want to use std::min and std::max. -#ifndef max -#define max max + +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x601 #endif -#ifndef min -#define min min + +#ifndef WINVER +#define WINVER 0x0601 #endif // CURL needs winsock, so don't prevent inclusion of it @@ -65,6 +61,11 @@ #endif /* OS(WINDOWS) */ +// Using CMake with Unix makefiles does not use prefix headers. +#if PLATFORM(MAC) && defined(BUILDING_WITH_CMAKE) +#include "WebCorePrefix.h" +#endif + #ifdef __cplusplus // These undefs match up with defines in WebCorePrefix.h for Mac OS X. @@ -87,27 +88,26 @@ #if PLATFORM(WIN) #if PLATFORM(WIN_CAIRO) -#undef WTF_USE_CG -#define WTF_USE_CAIRO 1 -#define WTF_USE_CURL 1 +#undef USE_CG +#define USE_CAIRO 1 +#define USE_CURL 1 #ifndef _WINSOCKAPI_ #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h #endif #elif !USE(WINGDI) -#define WTF_USE_CG 1 -#undef WTF_USE_CAIRO -#undef WTF_USE_CURL +#define USE_CG 1 +#undef USE_CAIRO +#undef USE_CURL #endif #endif #if PLATFORM(MAC) -// New theme -#define WTF_USE_NEW_THEME 1 -#endif // PLATFORM(MAC) +#define USE_NEW_THEME 1 +#endif #if USE(CG) #ifndef CGFLOAT_DEFINED -#ifdef __LP64__ +#if (defined(__LP64__) && __LP64__) || (defined(__x86_64__) && __x86_64__) || defined(_M_X64) || defined(__amd64__) typedef double CGFloat; #else typedef float CGFloat; @@ -116,22 +116,13 @@ typedef float CGFloat; #endif #endif /* USE(CG) */ -#if PLATFORM(WIN) && USE(CG) -#define WTF_USE_SAFARI_THEME 1 -#endif - -// CoreAnimation is available to IOS, Mac and Windows if using CG -#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && USE(CG)) -#define WTF_USE_CA 1 -#endif - -// FIXME: Move this to JavaScriptCore/wtf/Platform.h, which is where we define WTF_USE_AVFOUNDATION on the Mac. +// FIXME: Move this to JavaScriptCore/wtf/Platform.h, which is where we define USE_AVFOUNDATION on the Mac. // https://bugs.webkit.org/show_bug.cgi?id=67334 #if PLATFORM(WIN) && USE(CG) && HAVE(AVCF) -#define WTF_USE_AVFOUNDATION 1 +#define USE_AVFOUNDATION 1 #if HAVE(AVCF_LEGIBLE_OUTPUT) -#define WTF_USE_AVFOUNDATION 1 +#define USE_AVFOUNDATION 1 #define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1 #define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1 #define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1 |