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/WebKit2/WebKit2Prefix.h | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebKit2/WebKit2Prefix.h')
| -rw-r--r-- | Source/WebKit2/WebKit2Prefix.h | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/Source/WebKit2/WebKit2Prefix.h b/Source/WebKit2/WebKit2Prefix.h index 9ae33e453..57509b97a 100644 --- a/Source/WebKit2/WebKit2Prefix.h +++ b/Source/WebKit2/WebKit2Prefix.h @@ -24,32 +24,26 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#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) +#if PLATFORM(COCOA) -#if !PLATFORM(IOS) -#define ENABLE_WEB_PROCESS_SANDBOX 1 -#endif +#define ENABLE_SANDBOX_EXTENSIONS 1 -#define ENABLE_NETWORK_PROCESS 1 +#define ENABLE_WEB_PROCESS_SANDBOX 1 #define ENABLE_DATABASE_PROCESS 1 #define ENABLE_MEMORY_SAMPLER 1 -#define ENABLE_CUSTOM_PROTOCOLS 1 - #define ENABLE_SHAREABLE_RESOURCE 1 +#define _WKImmediateActionType _WKImmediateActionType + #include <CoreFoundation/CoreFoundation.h> #include <CoreGraphics/CoreGraphics.h> @@ -57,24 +51,14 @@ #import <Foundation/Foundation.h> #if USE(APPKIT) #import <Cocoa/Cocoa.h> +#import <wtf/mac/AppKitCompatibilityDeclarations.h> #endif #endif -#if ENABLE(NETSCAPE_PLUGIN_API) -#define ENABLE_SHARED_WORKER_PROCESS 1 -#endif - -#else -#define ENABLE_SHARED_WORKER_PROCESS 1 -#endif - -#if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090) || !PLATFORM(IOS_SIMULATOR) -#define WTF_USE_XPC_SERVICES 1 #endif #if PLATFORM(GTK) -#define ENABLE_NETWORK_PROCESS 1 -#define ENABLE_CUSTOM_PROTOCOLS 1 +#define ENABLE_SHAREABLE_RESOURCE 1 #endif /* When C++ exceptions are disabled, the C++ library defines |try| and |catch| @@ -95,3 +79,4 @@ #define new ("if you use new/delete make sure to include config.h at the top of the file"()) #define delete ("if you use new/delete make sure to include config.h at the top of the file"()) #endif + |