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/WebCore/config.h | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/config.h')
| -rw-r--r-- | Source/WebCore/config.h | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/Source/WebCore/config.h b/Source/WebCore/config.h index 660e5c91e..d5d43fe4d 100644 --- a/Source/WebCore/config.h +++ b/Source/WebCore/config.h @@ -19,22 +19,18 @@ * */ -#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(COCOA) -#define WTF_USE_FILE_LOCK 1 +#define USE_FILE_LOCK 1 #endif #if PLATFORM(WIN) && !USE(WINGDI) -#include <WebCore/WebCoreHeaderDetection.h> +#include "WebCoreHeaderDetection.h" #endif #include <wtf/ExportMacros.h> @@ -49,11 +45,11 @@ #if OS(WINDOWS) #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0502 +#define _WIN32_WINNT 0x601 #endif #ifndef WINVER -#define WINVER 0x0502 +#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,21 +88,24 @@ #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(DIRECT2D) +#undef USE_CA +#undef USE_CG #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) && !PLATFORM(IOS) -#define WTF_USE_NEW_THEME 1 +#if PLATFORM(MAC) +#define USE_NEW_THEME 1 #endif #if USE(CG) @@ -115,26 +119,16 @@ typedef float CGFloat; #endif #endif /* USE(CG) */ -#if PLATFORM(WIN) && USE(CG) -#define WTF_USE_SAFARI_THEME 1 -#endif - -#if PLATFORM(IOS) -#define WEBCORE_NAVIGATOR_PLATFORM wkGetPlatformNameForNavigator(); -#define WEBCORE_NAVIGATOR_VENDOR wkGetVendorNameForNavigator(); -#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 #endif #endif - |